[gentoo-commits] dev/leio:master commit in: media-libs/cogl/, media-libs/clutter/
commit: 10bd941351ccb13cb6ed91161c47a2595d43d9a2
Author: Mart Raudsepp gentoo org>
AuthorDate: Thu Mar 17 23:00:25 2016 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Thu Mar 17 23:00:25 2016 +
URL:https://gitweb.gentoo.org/dev/leio.git/commit/?id=10bd9413
cogl/clutter: Remove until sync with main tree is done
Old versions are inheriting old clutter.eclass from main tree, which has since
been deprecated and deleted.
These modification might be unnecessary anyways in a VC4 mesa driver world
future.
Gentoo-Bug: 574524
media-libs/clutter/Manifest | 1 -
media-libs/clutter/clutter-1.18.2.ebuild | 105 ---
media-libs/clutter/metadata.xml | 8 ---
media-libs/cogl/Manifest | 1 -
media-libs/cogl/cogl-1.18.2.ebuild | 119 ---
media-libs/cogl/metadata.xml | 10 ---
6 files changed, 244 deletions(-)
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
deleted file mode 100644
index a213031..000
--- a/media-libs/clutter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST clutter-1.18.2.tar.xz 5215180 SHA256
f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63 SHA512
d7cf0d523dfd95f62910376d3958d50b9fd0debee0fd2e0c7c284500c78b5899fb0bb30dd279c638b4bc1cefaf63af376328f5e1c476d38c34ce4a79bd772b18
WHIRLPOOL
e52c97e7c429b2a428e3749e8a6cafb2c9e5174a8437cd1f427b5c24c9df91f911a7ce76614d5131f6e6028504d5b23bf70ccf8b3e9b63a90af5a87329366f19
diff --git a/media-libs/clutter/clutter-1.18.2.ebuild
b/media-libs/clutter/clutter-1.18.2.ebuild
deleted file mode 100644
index 4a15fb0..000
--- a/media-libs/clutter/clutter-1.18.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-CLUTTER_LA_PUNT="yes"
-
-# Inherit gnome2 after clutter to download sources from gnome.org
-# since clutter-project.org doesn't provide .xz tarballs
-inherit clutter gnome2 virtualx
-
-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 X" # evdev tslib
-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
-# XXX: Probably require one of USE=X or USE=egl
-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]
- >=x11-libs/pango-1.30[introspection?]
-
- X? (
- 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 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.20
- virtual/pkgconfig
- >=sys-devel/gettext-0.17
- doc? (
- >=dev-util/gtk-doc-1.20
- >=app-text/docbook-sgml-utils-0.6.14[jadetex]
- dev-libs/libxslt )
- test? ( x11-libs/gdk-pixbuf )"
-
-# Tests fail with both swrast and llvmpipe
-# They pass under r600g or i965, so the bug is in mesa
-#RESTRICT="test"
-
-src_prepare() {
- # We only need conformance tests, the rest are useless for us
- sed -e 's/^\(SUBDIRS =\).*/\1 accessibility conform/g' \
- -i tests/Makefile.am || die "am tests sed failed"
- sed -e 's/^\(SUBDIRS =\)[^\]*/\1 accessibility conform/g' \
- -i tests/Makefile.in || die "in tests sed failed"
-
- gnome2_src_prepare
-}
-
-src_configure() {
- DOCS="README NEWS ChangeLog*"
-
- # 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/egl/osx/wayland/win32 backends?
- # XXX: evdev/tslib input seem to be experimental?
- gnome2_src_configure \
- $(usex X --enable-xinput) \
- $(usex X --enable-x11-backend=yes) \
- --disable-profile \
- --disable-maintainer-flags \
- --disable-gcov \
- --disable-cex100-backend \
- $(usex egl --enable-egl-backend --disable-egl-backend) \
- --disable-quartz-backend \
- --disable-wayland-backend \
- --disable-win32-backend \
- --disable-tslib-input \
-
[gentoo-commits] dev/leio:master commit in: media-libs/cogl/
commit: 662ea30bff4b5f17280158d776eff3b179715fe1
Author: Mart Raudsepp leio AT gentoo DOT org
AuthorDate: Mon Jul 14 13:36:26 2014 +
Commit: Mart Raudsepp leio AT gentoo DOT org
CommitDate: Mon Jul 14 13:36:26 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/leio.git;a=commit;h=662ea30b
Add media-libs/cogl tweaked to be buildable without mesa on RPi
Allows building cogl without virtual/opengl with USE=-opengl gles2 and
adds USE=rpi for choosing raspberrypi-userland as gles2 provider.
Not runtime tested.
Probably should have a REQUIRED_USE on requiring either one of USE opengl,
gles2 (or both)
---
media-libs/cogl/Manifest | 1 +
media-libs/cogl/cogl-1.18.2.ebuild | 119 +
media-libs/cogl/metadata.xml | 10
3 files changed, 130 insertions(+)
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
new file mode 100644
index 000..5e289d7
--- /dev/null
+++ b/media-libs/cogl/Manifest
@@ -0,0 +1 @@
+DIST cogl-1.18.2.tar.xz 1635384 SHA256
9278e519d5480eb0379efd48db024e8fdbf93f01dff48a7e756b85b508a863aa SHA512
c8903a10c476850c77f71eba584854bccf26adae6f62a9232adf8baf728fe2b69273bd5cd5418e7cd72801a2c0e4c85ef8afc08e28ebd5016b81693aef2ecab8
WHIRLPOOL
e7538b92af2efe2f3845fde5c97ba9744d53ddb7a05eadb3cf310c43a3536a41001e4a0596a593ae3cfede4a02115a1d9be8aa423e9c814675059f0f777ec4a5
diff --git a/media-libs/cogl/cogl-1.18.2.ebuild
b/media-libs/cogl/cogl-1.18.2.ebuild
new file mode 100644
index 000..4e5fe81
--- /dev/null
+++ b/media-libs/cogl/cogl-1.18.2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+CLUTTER_LA_PUNT=yes
+
+# Inherit gnome2 after clutter to download sources from gnome.org
+inherit clutter gnome2 multilib virtualx
+
+DESCRIPTION=A library for using 3D graphics hardware to draw pretty pictures
+HOMEPAGE=http://www.cogl3d.org/;
+
+LICENSE=MIT BSD
+SLOT=1.0/20 # subslot = .so version
+# doc and profile disable for now due bugs #484750 and #483332
+IUSE=examples gles2 gstreamer +introspection +opengl +pango rpi test # doc
profile
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+
+COMMON_DEPEND=
+ =dev-libs/glib-2.32:2
+ x11-libs/cairo:=
+ =x11-libs/gdk-pixbuf-2:2
+ x11-libs/libdrm:=
+ x11-libs/libX11
+ =x11-libs/libXcomposite-0.4
+ x11-libs/libXdamage
+ x11-libs/libXext
+ =x11-libs/libXfixes-3
+ =x11-libs/libXrandr-1.2
+ opengl? ( virtual/opengl )
+ gles2? ( || ( rpi? ( media-libs/raspberrypi-userland )
media-libs/mesa[gles2] ) )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0 )
+
+ introspection? ( =dev-libs/gobject-introspection-1.34.2 )
+ pango? ( =x11-libs/pango-1.20.0[introspection?] )
+
+# before clutter-1.7, cogl was part of clutter
+RDEPEND=${COMMON_DEPEND}
+ !media-libs/clutter-1.7
+DEPEND=${COMMON_DEPEND}
+ =dev-util/gtk-doc-am-1.13
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? (
+ app-admin/eselect-opengl
+ media-libs/mesa[classic] )
+
+
+# Need classic mesa swrast for tests, llvmpipe causes a test failure
+# Fox some reason GL3 conformance test all fails again...
+RESTRICT=test
+
+src_prepare() {
+ # Do not build examples
+ sed -e s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/ \
+ -i Makefile.am Makefile.in || die
+
+ if ! use test ; then
+ # For some reason the configure switch will not completely
disable
+ # tests being built
+ sed -e s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/ \
+ -e s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/ \
+ -e s/^\(.*am__append.* \)tests\(.*\)$/\1\2/ \
+ -i Makefile.am Makefile.in || die
+ fi
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # TODO: think about kms-egl, quartz, sdl, wayland
+ # Prefer gl over gles2 if both are selected
+ # Profiling needs uprof, which is not available in portage yet, bug
#484750
+ # FIXME: Doesn't provide prebuilt docs, but they can neither be
rebuilt, bug #483332
+ gnome2_src_configure \
+ --disable-examples-install \
+ --disable-maintainer-flags \
+ --enable-cairo \
+ --enable-deprecated\
+ --enable-gdk-pixbuf\
+ --enable-glib \
+ $(use_enable opengl glx) \
+ $(use_enable opengl gl)\
+ $(use_enable gles2)\
+ $(use_enable gles2 cogl-gles2) \
+ $(use_enable gles2 xlib-egl-platform) \
+ $(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
+ $(use_enable gstreamer cogl-gst)\
+
