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 18B1C1381F3 for ; Sun, 25 Aug 2013 16:42:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AC00E0B1C; Sun, 25 Aug 2013 16:42:25 +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 9790FE0B1C for ; Sun, 25 Aug 2013 16:42:24 +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 739C133EC69 for ; Sun, 25 Aug 2013 16:42:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 20880E468F for ; Sun, 25 Aug 2013 16:42:22 +0000 (UTC) From: "Chi-Thanh Christopher Nguyen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Chi-Thanh Christopher Nguyen" Message-ID: <1377448945.605e97acb5da3492ce4e7b24445520071cfebdcd.chithead@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: dev-libs/weston/ X-VCS-Repository: proj/x11 X-VCS-Files: dev-libs/weston/weston-9999.ebuild X-VCS-Directories: dev-libs/weston/ X-VCS-Committer: chithead X-VCS-Committer-Name: Chi-Thanh Christopher Nguyen X-VCS-Revision: 605e97acb5da3492ce4e7b24445520071cfebdcd X-VCS-Branch: master Date: Sun, 25 Aug 2013 16:42:22 +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: f7b58ff0-b1ce-4561-9afa-a67252a39599 X-Archives-Hash: d3707a279b5a2e75f5c86fd069f9a124 commit: 605e97acb5da3492ce4e7b24445520071cfebdcd Author: Chi-Thanh Christopher Nguyen gentoo org> AuthorDate: Sun Aug 25 16:42:25 2013 +0000 Commit: Chi-Thanh Christopher Nguyen cs tu-berlin de> CommitDate: Sun Aug 25 16:42:25 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=605e97ac dev-libs/weston: Import ebuild changes from portage for bug #481364. --- dev-libs/weston/weston-9999.ebuild | 65 ++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 23 deletions(-) diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild index 2dceef4..57aec7e 100644 --- a/dev-libs/weston/weston-9999.ebuild +++ b/dev-libs/weston/weston-9999.ebuild @@ -30,13 +30,10 @@ IUSE="colord +drm +egl editor examples fbdev gles2 headless +opengl rdp +resize- REQUIRED_USE=" drm? ( egl ) - editor? ( examples ) egl? ( || ( gles2 opengl ) ) fbdev? ( drm ) gles2? ( !opengl ) - rpi? ( gles2 ) test? ( X ) - view? ( examples ) wayland-compositor? ( egl ) " @@ -66,12 +63,10 @@ RDEPEND=" media-libs/glu media-libs/mesa[gles2] ) - examples? ( - editor? ( x11-libs/pango ) - view? ( - app-text/poppler:=[cairo] - dev-libs/glib:2 - ) + editor? ( x11-libs/pango ) + view? ( + app-text/poppler:=[cairo] + dev-libs/glib:2 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) rpi? ( @@ -98,7 +93,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig " - src_prepare() { if [[ ${PV} = 9999* ]]; then eautoreconf @@ -108,12 +102,21 @@ src_prepare() { src_configure() { local myconf if use examples || use gles2 || use test; then - myconf="--enable-simple-clients + myconf="--enable-simple-clients $(use_enable egl simple-egl-clients)" else - myconf="--disable-simple-clients + myconf="--disable-simple-clients --disable-simple-egl-clients" fi + + if use gles2; then + myconf+=" --with-cairo=glesv2" + elif use opengl; then + myconf+=" --with-cairo=gl" + else + myconf+=" --with-cairo=image" + fi + econf \ $(use_enable fbdev fbdev-compositor) \ $(use_enable drm drm-compositor) \ @@ -125,7 +128,6 @@ src_configure() { $(use_enable colord) \ $(use_enable egl) \ $(use_enable unwind libunwind) \ - $(use_with gles2 cairo-glesv2) \ $(use_enable resize-optimization) \ $(use_enable suid setuid-install) \ $(use_enable tablet tablet-shell) \ @@ -148,17 +150,34 @@ src_install() { readme.gentoo_src_install - cd "${BUILD_DIR}" || die - if use opengl && use egl; then - newbin clients/gears weston-gears + pushd clients || die + + if use opengl && use egl && use !gles2; then + dobin weston-gears + fi + if use editor; then + dobin weston-editor + fi + if use view; then + dobin weston-view fi if use examples; then - use egl && newbin clients/simple-egl weston-simple-egl - use editor && newbin clients/editor weston-editor - use view && newbin clients/view weston-view - local i - for i in calibrator clickdot cliptest dnd eventdemo flower fullscreen image resizor simple-shm simple-touch smoke transformed; do - newbin "clients/${i}" "weston-${i}" - done + use egl && dobin weston-simple-egl + dobin \ + weston-calibrator \ + weston-clickdot \ + weston-cliptest \ + weston-dnd \ + weston-eventdemo \ + weston-flower \ + weston-fullscreen \ + weston-image \ + weston-resizor \ + weston-simple-shm \ + weston-simple-touch \ + weston-smoke \ + weston-transformed fi + popd + }