commit: 0d995ce80f00c0d46b4d40b919610fc0fd1f8232
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 7 22:20:36 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 7 23:08:34 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0d995ce8
media-libs/clutter: add multiple backend support
Need someone to test aqua though.
---
media-libs/clutter/clutter-1.20.0.ebuild | 57 ++++++++++++++++++++------------
media-libs/clutter/clutter-9999.ebuild | 56 +++++++++++++++++++------------
2 files changed, 70 insertions(+), 43 deletions(-)
diff --git a/media-libs/clutter/clutter-1.20.0.ebuild
b/media-libs/clutter/clutter-1.20.0.ebuild
index 91acce4..3972acc 100644
--- a/media-libs/clutter/clutter-1.20.0.ebuild
+++ b/media-libs/clutter/clutter-1.20.0.ebuild
@@ -13,39 +13,52 @@ DESCRIPTION="Clutter is a library for creating graphical
user interfaces"
LICENSE="LGPL-2.1+ FDL-1.1+"
SLOT="1.0"
-IUSE="debug doc egl gtk +introspection test" # evdev tslib
+IUSE="aqua debug doc egl gtk +introspection test wayland +X"
+REQUIRED_USE="
+ || ( aqua wayland X )
+ wayland? ( egl )
+"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
# NOTE: glx flavour uses libdrm + >=mesa-7.3
# XXX: uprof needed for profiling
# >=libX11-1.3.1 needed for X Generic Event support
-# XXX: evdev input requires libinput and gudev >= 136
+# do not depend on tslib, it does not build and is disable by default upstream
RDEPEND="
>=dev-libs/glib-2.37.3:2
>=dev-libs/atk-2.5.3[introspection?]
>=dev-libs/json-glib-0.12[introspection?]
- >=media-libs/cogl-1.17.5:1.0=[introspection?,pango]
- media-libs/fontconfig
- >=x11-libs/cairo-1.12:=[glib]
+ >=media-libs/cogl-1.17.5:1.0=[introspection?,pango,wayland?]
+ >=x11-libs/cairo-1.12:=[aqua?,glib]
>=x11-libs/pango-1.30[introspection?]
virtual/opengl
x11-libs/libdrm:=
- >=x11-libs/libX11-1.3.1
- x11-libs/libXext
- x11-libs/libXdamage
- x11-proto/inputproto
- >=x11-libs/libXi-1.3
- >=x11-libs/libXcomposite-0.4
- egl? ( media-libs/cogl[gles2] )
- gtk? ( >=x11-libs/gtk+-3.3.18:3 )
+ egl? (
+ >=dev-libs/libinput-0.4
+ media-libs/cogl[gles2]
+ >=virtual/libgudev-136
+ x11-libs/libxkbcommon
+ )
+ gtk? ( >=x11-libs/gtk+-3.3.18:3[aqua?] )
introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+ X? (
+ media-libs/fontconfig
+ >=x11-libs/libX11-1.3.1
+ x11-libs/libXext
+ x11-libs/libXdamage
+ x11-proto/inputproto
+ >=x11-libs/libXi-1.3
+ >=x11-libs/libXcomposite-0.4 )
+ wayland? (
+ dev-libs/wayland
+ x11-libs/gdk-pixbuf:2 )
"
DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.20
- virtual/pkgconfig
>=sys-devel/gettext-0.17
+ virtual/pkgconfig
doc? (
>=dev-util/gtk-doc-1.20
>=app-text/docbook-sgml-utils-0.6.14[jadetex]
@@ -70,26 +83,26 @@ src_configure() {
# XXX: Conformance test suite (and clutter itself) does not work under
Xvfb
# (GLX error blabla)
# XXX: Profiling, coverage disabled for now
- # XXX: What about cex100/osx/wayland/win32 backends?
- # XXX: evdev/tslib input seem to be experimental?
+ # XXX: What about cex100/win32 backends?
gnome2_src_configure \
- --enable-xinput \
- --enable-x11-backend=yes \
--disable-profile \
--disable-maintainer-flags \
--disable-gcov \
--disable-cex100-backend \
- --disable-quartz-backend \
- --disable-wayland-backend \
--disable-win32-backend \
--disable-tslib-input \
- --disable-evdev-input \
+ $(use_enable aqua quartz-backend) \
$(usex debug --enable-debug=yes --enable-debug=minimum) \
$(use_enable doc docs) \
$(use_enable egl egl-backend) \
+ $(use_enable egl evdev-input) \
$(use_enable gtk gdk-backend) \
$(use_enable introspection) \
- $(use_enable test gdk-pixbuf)
+ $(use_enable test gdk-pixbuf) \
+ $(use_enable wayland wayland-backend) \
+ $(use_enable wayland wayland-compositor) \
+ $(use_enable X xinput) \
+ $(use_enable X x11-backend)
}
src_test() {
diff --git a/media-libs/clutter/clutter-9999.ebuild
b/media-libs/clutter/clutter-9999.ebuild
index ae1f837..ab46377 100644
--- a/media-libs/clutter/clutter-9999.ebuild
+++ b/media-libs/clutter/clutter-9999.ebuild
@@ -16,7 +16,11 @@ DESCRIPTION="Clutter is a library for creating graphical
user interfaces"
LICENSE="LGPL-2.1+ FDL-1.1+"
SLOT="1.0"
-IUSE="debug doc egl gtk +introspection test" # evdev tslib
+IUSE="aqua debug doc egl gtk +introspection test wayland +X"
+REQUIRED_USE="
+ || ( aqua wayland X )
+ wayland? ( egl )
+"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -26,32 +30,42 @@ fi
# NOTE: glx flavour uses libdrm + >=mesa-7.3
# XXX: uprof needed for profiling
# >=libX11-1.3.1 needed for X Generic Event support
-# XXX: evdev input requires libinput and gudev >= 136
+# do not depend on tslib, it does not build and is disable by default upstream
RDEPEND="
>=dev-libs/glib-2.37.3:2
>=dev-libs/atk-2.5.3[introspection?]
>=dev-libs/json-glib-0.12[introspection?]
- >=media-libs/cogl-1.17.5:1.0=[introspection?,pango]
- media-libs/fontconfig
- >=x11-libs/cairo-1.12:=[glib]
+ >=media-libs/cogl-1.17.5:1.0=[introspection?,pango,wayland?]
+ >=x11-libs/cairo-1.12:=[aqua?,glib]
>=x11-libs/pango-1.30[introspection?]
virtual/opengl
x11-libs/libdrm:=
- >=x11-libs/libX11-1.3.1
- x11-libs/libXext
- x11-libs/libXdamage
- x11-proto/inputproto
- >=x11-libs/libXi-1.3
- >=x11-libs/libXcomposite-0.4
- gtk? ( >=x11-libs/gtk+-3.3.18:3 )
+ egl? (
+ >=dev-libs/libinput-0.4
+ media-libs/cogl[gles2]
+ >=virtual/libgudev-136
+ x11-libs/libxkbcommon
+ )
+ gtk? ( >=x11-libs/gtk+-3.3.18:3[aqua?] )
introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+ X? (
+ media-libs/fontconfig
+ >=x11-libs/libX11-1.3.1
+ x11-libs/libXext
+ x11-libs/libXdamage
+ x11-proto/inputproto
+ >=x11-libs/libXi-1.3
+ >=x11-libs/libXcomposite-0.4 )
+ wayland? (
+ dev-libs/wayland
+ x11-libs/gdk-pixbuf:2 )
"
DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.20
- virtual/pkgconfig
>=sys-devel/gettext-0.17
+ virtual/pkgconfig
doc? (
>=dev-util/gtk-doc-1.20
>=app-text/docbook-sgml-utils-0.6.14[jadetex]
@@ -76,26 +90,26 @@ src_configure() {
# XXX: Conformance test suite (and clutter itself) does not work under
Xvfb
# (GLX error blabla)
# XXX: Profiling, coverage disabled for now
- # XXX: What about cex100/osx/wayland/win32 backends?
- # XXX: evdev/tslib input seem to be experimental?
+ # XXX: What about cex100/win32 backends?
gnome2_src_configure \
- --enable-xinput \
- --enable-x11-backend=yes \
--disable-profile \
--disable-maintainer-flags \
--disable-gcov \
--disable-cex100-backend \
- --disable-quartz-backend \
- --disable-wayland-backend \
--disable-win32-backend \
--disable-tslib-input \
- --disable-evdev-input \
+ $(use_enable aqua quartz-backend) \
$(usex debug --enable-debug=yes --enable-debug=minimum) \
$(use_enable doc docs) \
$(use_enable egl egl-backend) \
+ $(use_enable egl evdev-input) \
$(use_enable gtk gdk-backend) \
$(use_enable introspection) \
- $(use_enable test gdk-pixbuf)
+ $(use_enable test gdk-pixbuf) \
+ $(use_enable wayland wayland-backend) \
+ $(use_enable wayland wayland-compositor) \
+ $(use_enable X xinput) \
+ $(use_enable X x11-backend)
}
src_test() {
