| 1 |
commit: 2a24e091a0b6f43e2f1df2fe3b9df4914d113b8b |
| 2 |
Author: David Heidelberger <david.heidelberger <AT> ixit <DOT> cz> |
| 3 |
AuthorDate: Sat Nov 23 20:26:44 2013 +0000 |
| 4 |
Commit: David Heidelberger <d.okias <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sat Nov 23 20:26:44 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=2a24e091 |
| 7 |
|
| 8 |
dev-libs/weston: improve weston USE and deps |
| 9 |
|
| 10 |
--- |
| 11 |
dev-libs/weston/weston-1.3.1.ebuild | 12 ++++++------ |
| 12 |
dev-libs/weston/weston-9999.ebuild | 9 ++++----- |
| 13 |
2 files changed, 10 insertions(+), 11 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-libs/weston/weston-1.3.1.ebuild b/dev-libs/weston/weston-1.3.1.ebuild |
| 16 |
index f5c4db5..bf704ec 100644 |
| 17 |
--- a/dev-libs/weston/weston-1.3.1.ebuild |
| 18 |
+++ b/dev-libs/weston/weston-1.3.1.ebuild |
| 19 |
@@ -1,6 +1,6 @@ |
| 20 |
# Copyright 1999-2013 Gentoo Foundation |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/weston/weston-1.2.1.ebuild,v 1.1 2013/08/25 16:39:48 chithanh Exp $ |
| 23 |
+# $Header: $ |
| 24 |
|
| 25 |
EAPI=5 |
| 26 |
|
| 27 |
@@ -27,28 +27,26 @@ fi |
| 28 |
|
| 29 |
LICENSE="MIT CC-BY-SA-3.0" |
| 30 |
SLOT="0" |
| 31 |
-IUSE="colord +drm +egl editor examples fbdev gles2 headless +opengl rdp +resize-optimization rpi static-libs +suid systemd tablet test unwind view wayland-compositor +X xwayland" |
| 32 |
+IUSE="colord +drm +egl editor examples fbdev gles2 headless +opengl rdp +resize-optimization rpi +launch static-libs +suid systemd tablet test unwind view wayland-compositor +X xwayland" |
| 33 |
|
| 34 |
REQUIRED_USE=" |
| 35 |
drm? ( egl ) |
| 36 |
egl? ( || ( gles2 opengl ) ) |
| 37 |
- fbdev? ( drm ) |
| 38 |
gles2? ( !opengl ) |
| 39 |
test? ( X ) |
| 40 |
wayland-compositor? ( egl ) |
| 41 |
" |
| 42 |
|
| 43 |
RDEPEND=" |
| 44 |
- >=dev-libs/wayland-1.1.90 |
| 45 |
- media-libs/mesa[egl?,wayland] |
| 46 |
+ >=dev-libs/wayland-1.2.90 |
| 47 |
media-libs/lcms:2 |
| 48 |
media-libs/libpng:= |
| 49 |
- media-libs/libwebp |
| 50 |
virtual/jpeg |
| 51 |
>=x11-libs/cairo-1.11.3[gles2(-)?,opengl?] |
| 52 |
>=x11-libs/libdrm-2.4.30 |
| 53 |
x11-libs/libxkbcommon |
| 54 |
x11-libs/pixman |
| 55 |
+ x11-misc/xkeyboard-config |
| 56 |
fbdev? ( |
| 57 |
>=sys-libs/mtdev-1.1.0 |
| 58 |
>=virtual/udev-136 |
| 59 |
@@ -77,6 +75,7 @@ RDEPEND=" |
| 60 |
sys-auth/pambase[systemd] |
| 61 |
sys-apps/systemd[pam] |
| 62 |
) |
| 63 |
+ launch? ( sys-auth/pambase ) |
| 64 |
unwind? ( sys-libs/libunwind ) |
| 65 |
X? ( |
| 66 |
x11-libs/libxcb |
| 67 |
@@ -126,6 +125,7 @@ src_configure() { |
| 68 |
$(use_enable rpi rpi-compositor) \ |
| 69 |
$(use_enable wayland-compositor) \ |
| 70 |
$(use_enable X x11-compositor) \ |
| 71 |
+ $(use_enable launch weston-launch) \ |
| 72 |
$(use_enable colord) \ |
| 73 |
$(use_enable egl) \ |
| 74 |
$(use_enable unwind libunwind) \ |
| 75 |
|
| 76 |
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild |
| 77 |
index 67c27cb..337034b 100644 |
| 78 |
--- a/dev-libs/weston/weston-9999.ebuild |
| 79 |
+++ b/dev-libs/weston/weston-9999.ebuild |
| 80 |
@@ -27,12 +27,11 @@ fi |
| 81 |
|
| 82 |
LICENSE="MIT CC-BY-SA-3.0" |
| 83 |
SLOT="0" |
| 84 |
-IUSE="colord +drm +egl editor examples fbdev gles2 headless +opengl rdp +resize-optimization rpi static-libs +suid systemd tablet test unwind view wayland-compositor +X xwayland" |
| 85 |
+IUSE="colord +drm +egl editor examples fbdev gles2 headless +opengl rdp +resize-optimization rpi +launch static-libs +suid systemd tablet test unwind view wayland-compositor +X xwayland" |
| 86 |
|
| 87 |
REQUIRED_USE=" |
| 88 |
drm? ( egl ) |
| 89 |
egl? ( || ( gles2 opengl ) ) |
| 90 |
- fbdev? ( drm ) |
| 91 |
gles2? ( !opengl ) |
| 92 |
test? ( X ) |
| 93 |
wayland-compositor? ( egl ) |
| 94 |
@@ -40,16 +39,14 @@ REQUIRED_USE=" |
| 95 |
|
| 96 |
RDEPEND=" |
| 97 |
>=dev-libs/wayland-1.3.90 |
| 98 |
- media-libs/mesa[egl?,wayland] |
| 99 |
media-libs/lcms:2 |
| 100 |
media-libs/libpng:= |
| 101 |
- media-libs/libwebp |
| 102 |
virtual/jpeg |
| 103 |
- sys-libs/pam |
| 104 |
>=x11-libs/cairo-1.11.3[gles2(-)?,opengl?] |
| 105 |
>=x11-libs/libdrm-2.4.30 |
| 106 |
x11-libs/libxkbcommon |
| 107 |
x11-libs/pixman |
| 108 |
+ x11-misc/xkeyboard-config |
| 109 |
fbdev? ( |
| 110 |
>=sys-libs/mtdev-1.1.0 |
| 111 |
>=virtual/udev-136 |
| 112 |
@@ -78,6 +75,7 @@ RDEPEND=" |
| 113 |
sys-auth/pambase[systemd] |
| 114 |
sys-apps/systemd[pam] |
| 115 |
) |
| 116 |
+ launch? ( sys-auth/pambase ) |
| 117 |
unwind? ( sys-libs/libunwind ) |
| 118 |
X? ( |
| 119 |
x11-libs/libxcb |
| 120 |
@@ -127,6 +125,7 @@ src_configure() { |
| 121 |
$(use_enable rpi rpi-compositor) \ |
| 122 |
$(use_enable wayland-compositor) \ |
| 123 |
$(use_enable X x11-compositor) \ |
| 124 |
+ $(use_enable launch weston-launch) \ |
| 125 |
$(use_enable colord) \ |
| 126 |
$(use_enable egl) \ |
| 127 |
$(use_enable unwind libunwind) \ |
Archives