commit: 9ef14574166a7576be006584ca5c6651a6652f77
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 18:20:22 2015 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 18:20:22 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9ef14574
media-libs/cogl: Bump version to 1.21.2
Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 7E8B4D42
.../cogl/{cogl-9999.ebuild => cogl-1.21.2.ebuild} | 45 ++++++++--------------
media-libs/cogl/cogl-9999.ebuild | 2 +-
2 files changed, 18 insertions(+), 29 deletions(-)
diff --git a/media-libs/cogl/cogl-9999.ebuild
b/media-libs/cogl/cogl-1.21.2.ebuild
similarity index 82%
copy from media-libs/cogl/cogl-9999.ebuild
copy to media-libs/cogl/cogl-1.21.2.ebuild
index df06afc..984b93d 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-1.21.2.ebuild
@@ -3,28 +3,21 @@
# $Id$
EAPI="5"
-CLUTTER_LA_PUNT="yes"
+GCONF_DEBUG="yes"
-# Inherit gnome2 after clutter to download sources from gnome.org
-inherit clutter gnome2 multilib virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
+inherit gnome2 multilib virtualx
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
HOMEPAGE="http://www.cogl3d.org/";
LICENSE="MIT BSD"
-SLOT="2.0/0" # subslot = .so version
+SLOT="1.0/20" # subslot = .so version
+
# doc and profile disable for now due bugs #484750 and #483332
IUSE="examples gles2 gstreamer +introspection +kms +opengl +pango test
wayland" # doc profile
-REQUIRED_USE="wayland? ( gles2 )"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
- IUSE="${IUSE} doc"
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
+REQUIRED_USE="wayland? ( gles2 )
+ || ( gles2 opengl )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
@@ -42,7 +35,7 @@ COMMON_DEPEND="
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0 )
- introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
+ introspection? ( >=dev-libs/gobject-introspection-1.34.2:= )
kms? (
media-libs/mesa[gbm]
x11-libs/libdrm:= )
@@ -53,7 +46,8 @@ COMMON_DEPEND="
"
# before clutter-1.7, cogl was part of clutter
RDEPEND="${COMMON_DEPEND}
- !<media-libs/clutter-1.7"
+ !<media-libs/clutter-1.7
+"
DEPEND="${COMMON_DEPEND}
>=dev-util/gtk-doc-am-1.13
sys-devel/gettext
@@ -67,17 +61,10 @@ DEPEND="${COMMON_DEPEND}
# For some reason GL3 conformance test all fails again...
RESTRICT="test"
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- doc? (
- app-text/docbook-xml-dtd:4.1.2
- >=dev-util/gtk-doc-1.13 )"
-fi
-
src_prepare() {
# Do not build examples
sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
- -i Makefile.am || die
+ -i Makefile.am Makefile.in || die
if ! use test ; then
# For some reason the configure switch will not completely
disable
@@ -85,7 +72,7 @@ src_prepare() {
sed -e "s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/" \
-e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \
-e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \
- -i Makefile.am || die
+ -i Makefile.am Makefile.in || die
fi
gnome2_src_prepare
@@ -133,10 +120,12 @@ src_test() {
}
src_install() {
- DOCS="NEWS README"
- EXAMPLES="examples/{*.c,*.jpg}"
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins examples/{*.c,*.jpg}
+ fi
- clutter_src_install
+ gnome2_src_install
# Remove silly examples-data directory
rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index df06afc..10d4c6d 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0 )
- introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
+ introspection? ( >=dev-libs/gobject-introspection-1.34.2:= )
kms? (
media-libs/mesa[gbm]
x11-libs/libdrm:= )
