* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2011-10-01 4:39 Alexandre Restovtsev
0 siblings, 0 replies; 21+ messages in thread
From: Alexandre Restovtsev @ 2011-10-01 4:39 UTC (permalink / raw
To: gentoo-commits
commit: 8008e14ea6fa430ba6ddf9ed17fc5f3531a8d1e2
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Oct 1 04:38:09 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Oct 1 04:38:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8008e14e
media-libs/cogl: replace old clutter blocker with !<
As pointed out by Olivier Crete on IRC, a '!<' blocker will allow
portage to automatically update clutter despite file collisions.
---
media-libs/cogl/cogl-1.8.0.ebuild | 2 +-
media-libs/cogl/cogl-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/cogl/cogl-1.8.0.ebuild b/media-libs/cogl/cogl-1.8.0.ebuild
index adf4366..83eccfd 100644
--- a/media-libs/cogl/cogl-1.8.0.ebuild
+++ b/media-libs/cogl/cogl-1.8.0.ebuild
@@ -39,7 +39,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.26.0: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"
+ !<media-libs/clutter-1.7"
DEPEND="${COMMON_DEPEND}
dev-util/pkgconfig
sys-devel/gettext
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index adf4366..83eccfd 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -39,7 +39,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.26.0: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"
+ !<media-libs/clutter-1.7"
DEPEND="${COMMON_DEPEND}
dev-util/pkgconfig
sys-devel/gettext
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2011-10-18 7:37 Alexandre Restovtsev
0 siblings, 0 replies; 21+ messages in thread
From: Alexandre Restovtsev @ 2011-10-18 7:37 UTC (permalink / raw
To: gentoo-commits
commit: f92ca07fab2553abb08f5f2fd1c9d54903bbc592
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Oct 18 05:13:33 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Oct 18 05:13:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f92ca07f
media-libs/cogl: 1.8.0 → 1.8.2
Bump, fixes a crash and a memory leak.
---
.../cogl/{cogl-1.8.0.ebuild => cogl-1.8.2.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-libs/cogl/cogl-1.8.0.ebuild b/media-libs/cogl/cogl-1.8.2.ebuild
similarity index 100%
rename from media-libs/cogl/cogl-1.8.0.ebuild
rename to media-libs/cogl/cogl-1.8.2.ebuild
^ permalink raw reply [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2011-10-29 19:41 Alexandre Restovtsev
0 siblings, 0 replies; 21+ messages in thread
From: Alexandre Restovtsev @ 2011-10-29 19:41 UTC (permalink / raw
To: gentoo-commits
commit: 47e1f6c9f8ea515e4f44a2ab2799f7323a8f7085
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 19:33:42 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Oct 29 19:33:42 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=47e1f6c9
media-libs/cogl: 1.8.2 moved to gx86; update keywords from gx86
---
media-libs/cogl/cogl-1.8.2.ebuild | 74 -------------------------------------
media-libs/cogl/cogl-9999.ebuild | 2 +-
2 files changed, 1 insertions(+), 75 deletions(-)
diff --git a/media-libs/cogl/cogl-1.8.2.ebuild b/media-libs/cogl/cogl-1.8.2.ebuild
deleted file mode 100644
index 83eccfd..0000000
--- a/media-libs/cogl/cogl-1.8.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-CLUTTER_LA_PUNT="yes"
-
-# Inherit gnome2 after clutter to download sources from gnome.org
-inherit clutter gnome2 virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
-
-DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
-HOMEPAGE="http://www.clutter-project.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-IUSE="doc examples +introspection +pango"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~x86"
-fi
-
-# XXX: need uprof for optional profiling support
-COMMON_DEPEND=">=dev-libs/glib-2.26.0: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
- virtual/opengl
-
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
- 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/pkgconfig
- sys-devel/gettext
- doc? ( app-text/docbook-xml-dtd:4.1.2
- >=dev-util/gtk-doc-1.13 )"
-
-# XXX: at least when using nvidia-drivers, tests fail under Xemake/Xvfb, no
-# matter whether "eselect opengl" is set to nvidia or xorg-x11.
-RESTRICT="test"
-
-pkg_setup() {
- DOCS="NEWS README"
- EXAMPLES="examples/{*.c,*.jpg}"
- # XXX: think about gles, quartz, wayland
- G2CONF="${G2CONF}
- --disable-profile
- --disable-maintainer-flags
- --enable-cairo
- --enable-gdk-pixbuf
- --enable-gl
- --enable-glx
- $(use_enable introspection)
- $(use_enable pango cogl-pango)"
-}
-
-src_test() {
- Xemake check
-}
-
-src_install() {
- clutter_src_install
-}
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index 83eccfd..d4e7653 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -20,7 +20,7 @@ IUSE="doc examples +introspection +pango"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
fi
# XXX: need uprof for optional profiling support
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2012-09-15 7:53 Alexandre Rostovtsev
0 siblings, 0 replies; 21+ messages in thread
From: Alexandre Rostovtsev @ 2012-09-15 7:53 UTC (permalink / raw
To: gentoo-commits
commit: ad2ffd3109f9ba4d95cf374a87b269db47c810f1
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 06:41:53 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 06:41:53 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ad2ffd31
media-libs/cogl: add 1.11.4
---
media-libs/cogl/cogl-9999.ebuild | 47 ++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index 694082f..c5243a5 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -6,7 +6,7 @@ EAPI="4"
CLUTTER_LA_PUNT="yes"
# Inherit gnome2 after clutter to download sources from gnome.org
-inherit clutter gnome2 virtualx
+inherit clutter gnome2 multilib virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -16,15 +16,15 @@ HOMEPAGE="http://www.clutter-project.org/"
LICENSE="LGPL-2.1"
SLOT="1.0"
-IUSE="doc examples +introspection +pango"
+IUSE="doc examples +introspection +opengl gles2 +pango"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~x86"
fi
# XXX: need uprof for optional profiling support
-COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
+COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
x11-libs/cairo
>=x11-libs/gdk-pixbuf-2:2
x11-libs/libdrm
@@ -33,7 +33,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
x11-libs/libXdamage
x11-libs/libXext
>=x11-libs/libXfixes-3
+ virtual/glu
virtual/opengl
+ gles2? ( media-libs/mesa[gles2] )
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
pango? ( >=x11-libs/pango-1.20.0[introspection?] )"
@@ -44,31 +46,48 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext
virtual/pkgconfig
doc? ( app-text/docbook-xml-dtd:4.1.2
- >=dev-util/gtk-doc-1.13 )"
-
-# XXX: at least when using nvidia-drivers, tests fail under Xemake/Xvfb, no
-# matter whether "eselect opengl" is set to nvidia or xorg-x11.
-RESTRICT="test"
+ >=dev-util/gtk-doc-1.13 )
+ test? ( app-admin/eselect-opengl
+ media-libs/mesa[classic] )"
+# Need classic mesa swrast for tests, llvmpipe causes a test failure
pkg_setup() {
DOCS="NEWS README"
EXAMPLES="examples/{*.c,*.jpg}"
- # XXX: think about gles, quartz, wayland
+ # XXX: think about kms-egl, gles, quartz, sdl, wayland
G2CONF="${G2CONF}
+ --disable-examples-install
--disable-profile
--disable-maintainer-flags
--enable-cairo
--enable-gdk-pixbuf
- --enable-gl
- --enable-glx
+ $(use_enable opengl glx)
+ $(use_enable opengl gl)
+ $(use_enable gles2)
+ $(use_enable gles2 cogl-gles2)
+ $(use_enable gles2 xlib-egl-platform)
+ --enable-glib
+ --enable-deprecated
$(use_enable introspection)
$(use_enable pango cogl-pango)"
+ use gles2 && G2CONF="${G2CONF} --with-default-driver=gles2"
}
src_test() {
- Xemake check
+ # Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
+ # NOTE: recheck if this is needed after every mesa bump
+ if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then
+ ewarn "Skipping tests because a binary OpenGL library is enabled. To"
+ ewarn "run tests for ${PN}, you need to enable the Mesa library:"
+ ewarn "# eselect opengl set xorg-x11"
+ return
+ fi
+ LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
}
src_install() {
clutter_src_install
+
+ # Remove silly examples-data directory
+ rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2012-09-16 7:44 Alexandre Rostovtsev
0 siblings, 0 replies; 21+ messages in thread
From: Alexandre Rostovtsev @ 2012-09-16 7:44 UTC (permalink / raw
To: gentoo-commits
commit: 309cbc95b2438f33eba8223785a6010c3c6367e8
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 07:44:01 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 07:44:01 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=309cbc95
media-libs/cogl: really add 1.11.4
Thanks to David Hicks for noticing.
---
media-libs/cogl/cogl-1.11.4.ebuild | 93 ++++++++++++++++++++++++++++++++++++
1 files changed, 93 insertions(+), 0 deletions(-)
diff --git a/media-libs/cogl/cogl-1.11.4.ebuild b/media-libs/cogl/cogl-1.11.4.ebuild
new file mode 100644
index 0000000..c5243a5
--- /dev/null
+++ b/media-libs/cogl/cogl-1.11.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+CLUTTER_LA_PUNT="yes"
+
+# Inherit gnome2 after clutter to download sources from gnome.org
+inherit clutter gnome2 multilib virtualx
+if [[ ${PV} = 9999 ]]; then
+ inherit gnome2-live
+fi
+
+DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
+HOMEPAGE="http://www.clutter-project.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+IUSE="doc examples +introspection +opengl gles2 +pango"
+if [[ ${PV} = 9999 ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~x86"
+fi
+
+# XXX: need uprof for optional profiling support
+COMMON_DEPEND=">=dev-libs/glib-2.28.0: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
+ virtual/glu
+ virtual/opengl
+ gles2? ( media-libs/mesa[gles2] )
+
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ 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}
+ sys-devel/gettext
+ virtual/pkgconfig
+ doc? ( app-text/docbook-xml-dtd:4.1.2
+ >=dev-util/gtk-doc-1.13 )
+ test? ( app-admin/eselect-opengl
+ media-libs/mesa[classic] )"
+# Need classic mesa swrast for tests, llvmpipe causes a test failure
+
+pkg_setup() {
+ DOCS="NEWS README"
+ EXAMPLES="examples/{*.c,*.jpg}"
+ # XXX: think about kms-egl, gles, quartz, sdl, wayland
+ G2CONF="${G2CONF}
+ --disable-examples-install
+ --disable-profile
+ --disable-maintainer-flags
+ --enable-cairo
+ --enable-gdk-pixbuf
+ $(use_enable opengl glx)
+ $(use_enable opengl gl)
+ $(use_enable gles2)
+ $(use_enable gles2 cogl-gles2)
+ $(use_enable gles2 xlib-egl-platform)
+ --enable-glib
+ --enable-deprecated
+ $(use_enable introspection)
+ $(use_enable pango cogl-pango)"
+ use gles2 && G2CONF="${G2CONF} --with-default-driver=gles2"
+}
+
+src_test() {
+ # Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
+ # NOTE: recheck if this is needed after every mesa bump
+ if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then
+ ewarn "Skipping tests because a binary OpenGL library is enabled. To"
+ ewarn "run tests for ${PN}, you need to enable the Mesa library:"
+ ewarn "# eselect opengl set xorg-x11"
+ return
+ fi
+ LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
+}
+
+src_install() {
+ clutter_src_install
+
+ # Remove silly examples-data directory
+ rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2012-10-27 19:40 Gilles Dartiguelongue
0 siblings, 0 replies; 21+ messages in thread
From: Gilles Dartiguelongue @ 2012-10-27 19:40 UTC (permalink / raw
To: gentoo-commits
commit: 15cef37f0e072dfe5ac1de30cade86b0854f66b6
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 19:04:41 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 19:04:54 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=15cef37f
media-libs/cogl: add missing preserved_libs calls
---
media-libs/cogl/cogl-1.12.0.ebuild | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/media-libs/cogl/cogl-1.12.0.ebuild b/media-libs/cogl/cogl-1.12.0.ebuild
index 6632c9d..6a30a3f 100644
--- a/media-libs/cogl/cogl-1.12.0.ebuild
+++ b/media-libs/cogl/cogl-1.12.0.ebuild
@@ -97,3 +97,13 @@ src_install() {
# Remove silly examples-data directory
rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+ preserve_old_lib /usr/$(get_libdir)/libcogl.so.9
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ preserve_old_lib_notify /usr/$(get_libdir)/libcogl.so.9
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2012-12-19 0:39 Alexandre Rostovtsev
0 siblings, 0 replies; 21+ messages in thread
From: Alexandre Rostovtsev @ 2012-12-19 0:39 UTC (permalink / raw
To: gentoo-commits
commit: 019aed6e8170ad30fa684be709b03958f89c8333
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 19 00:38:07 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed Dec 19 00:38:19 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=019aed6e
media-libs/cogl: sync with gx86
Most desktop user want gl, not gles, as the default driver. Thanks to
Rafał Mużyło.
---
media-libs/cogl/cogl-9999.ebuild | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index 84b24b2..f1c79b8 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -55,6 +55,7 @@ src_prepare() {
DOCS="NEWS README"
EXAMPLES="examples/{*.c,*.jpg}"
# XXX: think about kms-egl, quartz, sdl, wayland
+ # Prefer gl over gles2 if both are selected
G2CONF="${G2CONF}
--disable-examples-install
--disable-profile
@@ -66,7 +67,7 @@ src_prepare() {
$(use_enable gles2)
$(use_enable gles2 cogl-gles2)
$(use_enable gles2 xlib-egl-platform)
- "$(usex gles2 --with-default-driver=gles2 "")"
+ "$(usex gles2 --with-default-driver=$(usex opengl gl gles2 ) "")"
--enable-glib
--enable-deprecated
$(use_enable introspection)
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2013-01-19 21:38 Alexandre Rostovtsev
0 siblings, 0 replies; 21+ messages in thread
From: Alexandre Rostovtsev @ 2013-01-19 21:38 UTC (permalink / raw
To: gentoo-commits
commit: 8a27fe3d840bc6019b221beb8da3d9d842b0ef46
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 19 21:38:20 2013 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sat Jan 19 21:38:20 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8a27fe3d
media-libs/cogl: remove unneeded glu dependency (#452912)
Thanks to Matt Turner for noticing.
---
media-libs/cogl/cogl-9999.ebuild | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index f1c79b8..4a4da33 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -33,7 +33,6 @@ COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
x11-libs/libXdamage
x11-libs/libXext
>=x11-libs/libXfixes-3
- virtual/glu
virtual/opengl
gles2? ( media-libs/mesa[gles2] )
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2013-03-15 7:38 Priit Laes
0 siblings, 0 replies; 21+ messages in thread
From: Priit Laes @ 2013-03-15 7:38 UTC (permalink / raw
To: gentoo-commits
commit: 9bd3bef45b41b61da345a70f973bdc44348271ca
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Mar 15 07:37:31 2013 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Mar 15 07:37:31 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9bd3bef4
media-libs/cogl: Add 1.13.4 to overlay
---
media-libs/cogl/cogl-1.13.4.ebuild | 102 ++++++++++++++++++++++++++++++++++++
1 files changed, 102 insertions(+), 0 deletions(-)
diff --git a/media-libs/cogl/cogl-1.13.4.ebuild b/media-libs/cogl/cogl-1.13.4.ebuild
new file mode 100644
index 0000000..0899ddd
--- /dev/null
+++ b/media-libs/cogl/cogl-1.13.4.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2013 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 eutils clutter gnome2 multilib virtualx
+
+DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
+HOMEPAGE="http://www.clutter-project.org/"
+
+LICENSE="LGPL-2.1+ FDL-1.1+"
+SLOT="1.0/12"
+IUSE="doc examples +introspection +opengl gles2 +pango"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+# XXX: need uprof for optional profiling support
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32.0: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/libXrandr
+ >=x11-libs/libXfixes-3
+ virtual/opengl
+ gles2? ( media-libs/mesa[gles2] )
+
+ 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
+ doc? ( >=dev-util/gtk-doc-1.13 )
+ test? ( app-admin/eselect-opengl
+ media-libs/mesa[classic] )
+"
+# Need classic mesa swrast for tests, llvmpipe causes a test failure
+
+src_configure() {
+ # XXX: think about kms-egl, quartz, sdl, wayland
+ # Prefer gl over gles2 if both are selected
+ gnome2_src_configure \
+ --disable-examples-install \
+ --disable-profile \
+ --disable-maintainer-flags \
+ --enable-cairo \
+ --enable-deprecated \
+ --enable-gdk-pixbuf \
+ --enable-glib \
+ $(use_enable doc gtk-doc) \
+ $(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 introspection) \
+ $(use_enable pango cogl-pango)
+}
+
+src_test() {
+ # Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
+ # NOTE: recheck if this is needed after every mesa bump
+ if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then
+ ewarn "Skipping tests because a binary OpenGL library is enabled. To"
+ ewarn "run tests for ${PN}, you need to enable the Mesa library:"
+ ewarn "# eselect opengl set xorg-x11"
+ return
+ fi
+ LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
+}
+
+src_install() {
+ DOCS="NEWS README"
+ EXAMPLES="examples/{*.c,*.jpg}"
+
+ clutter_src_install
+
+ # Remove silly examples-data directory
+ rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
+}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+ preserve_old_lib /usr/$(get_libdir)/libcogl.so.9
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ preserve_old_lib_notify /usr/$(get_libdir)/libcogl.so.9
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2013-12-19 23:40 Gilles Dartiguelongue
0 siblings, 0 replies; 21+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-19 23:40 UTC (permalink / raw
To: gentoo-commits
commit: 9c3caaaad8f755fdf1703e74fcfec747967cf307
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 19 23:38:06 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Dec 19 23:38:06 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9c3caaaa
media-libs/cogl: fix whitespaces
---
media-libs/cogl/cogl-1.16.0.ebuild | 4 ++--
media-libs/cogl/cogl-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-libs/cogl/cogl-1.16.0.ebuild b/media-libs/cogl/cogl-1.16.0.ebuild
index 9e4f292..102ec1f 100644
--- a/media-libs/cogl/cogl-1.16.0.ebuild
+++ b/media-libs/cogl/cogl-1.16.0.ebuild
@@ -53,13 +53,13 @@ DEPEND="${COMMON_DEPEND}
src_prepare() {
# Do not build examples
- sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
+ 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/" \
+ 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
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index acf6587..18ee627 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -67,13 +67,13 @@ fi
src_prepare() {
# Do not build examples
- sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
+ 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/" \
+ 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
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2014-04-15 22:05 Gilles Dartiguelongue
0 siblings, 0 replies; 21+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-15 22:05 UTC (permalink / raw
To: gentoo-commits
commit: 4fd35bb40d2b48f3ebe7fb90574f6068e07aa0b2
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 14 20:57:19 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Apr 15 20:33:33 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4fd35bb4
media-libs/cogl: 1.16.2 → 1.18.0
---
.../cogl/{cogl-9999.ebuild => cogl-1.18.0.ebuild} | 26 ++++++----------------
media-libs/cogl/cogl-9999.ebuild | 7 +++---
2 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-1.18.0.ebuild
similarity index 89%
copy from media-libs/cogl/cogl-9999.ebuild
copy to media-libs/cogl/cogl-1.18.0.ebuild
index 18ee627..882c317 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-1.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -7,23 +7,15 @@ CLUTTER_LA_PUNT="yes"
# Inherit gnome2 after clutter to download sources from gnome.org
inherit clutter gnome2 multilib virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
HOMEPAGE="http://www.clutter-project.org/"
-LICENSE="LGPL-2.1+ FDL-1.1+"
-SLOT="1.0/12" # subslot = .so version
+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 test" # doc profile
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
- IUSE="${IUSE} doc"
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
@@ -56,14 +48,10 @@ DEPEND="${COMMON_DEPEND}
app-admin/eselect-opengl
media-libs/mesa[classic] )
"
-# Need classic mesa swrast for tests, llvmpipe causes a test failure
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- doc? (
- app-text/docbook-xml-dtd:4.1.2
- >=dev-util/gtk-doc-1.13 )"
-fi
+# 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
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index 18ee627..14e5adf 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -14,8 +14,8 @@ fi
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
HOMEPAGE="http://www.clutter-project.org/"
-LICENSE="LGPL-2.1+ FDL-1.1+"
-SLOT="1.0/12" # subslot = .so version
+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 test" # doc profile
if [[ ${PV} = 9999 ]]; then
@@ -56,6 +56,7 @@ DEPEND="${COMMON_DEPEND}
app-admin/eselect-opengl
media-libs/mesa[classic] )
"
+
# Need classic mesa swrast for tests, llvmpipe causes a test failure
if [[ ${PV} = 9999 ]]; then
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2014-10-12 23:19 Gilles Dartiguelongue
0 siblings, 0 replies; 21+ messages in thread
From: Gilles Dartiguelongue @ 2014-10-12 23:19 UTC (permalink / raw
To: gentoo-commits
commit: 0c243292f6116ac22904a50a2a3d9264f08c0cc4
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 12 21:56:36 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 12 23:19:06 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0c243292
media-libs/cogl: cleanup
---
media-libs/cogl/cogl-1.18.0.ebuild | 121 -------------------------------------
1 file changed, 121 deletions(-)
diff --git a/media-libs/cogl/cogl-1.18.0.ebuild b/media-libs/cogl/cogl-1.18.0.ebuild
deleted file mode 100644
index 882c317..0000000
--- a/media-libs/cogl/cogl-1.18.0.ebuild
+++ /dev/null
@@ -1,121 +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
-inherit clutter gnome2 multilib virtualx
-
-DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
-HOMEPAGE="http://www.clutter-project.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 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
- virtual/opengl
- gles2? ( 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 \
- --disable-gtk-doc \
- $(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) \
- $(use_enable introspection) \
- $(use_enable pango cogl-pango) \
- $(use_enable test unit-tests) \
- --disable-profile
-# $(use_enable doc gtk-doc) \
-# $(use_enable profile)
-}
-
-src_test() {
- # Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
- # NOTE: recheck if this is needed after every mesa bump
- if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then
- ewarn "Skipping tests because a binary OpenGL library is enabled. To"
- ewarn "run tests for ${PN}, you need to enable the Mesa library:"
- ewarn "# eselect opengl set xorg-x11"
- return
- fi
- LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
-}
-
-src_install() {
- DOCS="NEWS README"
- EXAMPLES="examples/{*.c,*.jpg}"
-
- clutter_src_install
-
- # Remove silly examples-data directory
- rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2014-11-03 23:24 Gilles Dartiguelongue
0 siblings, 0 replies; 21+ messages in thread
From: Gilles Dartiguelongue @ 2014-11-03 23:24 UTC (permalink / raw
To: gentoo-commits
commit: c76181e80a90081d8bf0ab6d70fe097e4469fe25
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 3 23:21:25 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Nov 3 23:23:57 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c76181e8
media-libs/cogl: sync with gentoo-x86 + fix prepare
There is no .in in git, bug #508972.
---
media-libs/cogl/cogl-9999.ebuild | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index 14e5adf..0199c34 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
HOMEPAGE="http://www.clutter-project.org/"
LICENSE="MIT BSD"
-SLOT="1.0/20" # subslot = .so version
+SLOT="2.0/0" # subslot = .so version
# doc and profile disable for now due bugs #484750 and #483332
IUSE="examples gles2 gstreamer +introspection +opengl +pango test" # doc profile
if [[ ${PV} = 9999 ]]; then
@@ -69,15 +69,15 @@ fi
src_prepare() {
# Do not build examples
sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
- -i Makefile.am Makefile.in || die
+ -i Makefile.am || 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
+ -e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \
+ -e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \
+ -i Makefile.am || die
fi
gnome2_src_prepare
@@ -95,7 +95,6 @@ src_configure() {
--enable-deprecated \
--enable-gdk-pixbuf \
--enable-glib \
- --disable-gtk-doc \
$(use_enable opengl glx) \
$(use_enable opengl gl) \
$(use_enable gles2) \
@@ -107,7 +106,6 @@ src_configure() {
$(use_enable pango cogl-pango) \
$(use_enable test unit-tests) \
--disable-profile
-# $(use_enable doc gtk-doc) \
# $(use_enable profile)
}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2014-12-07 23:08 Gilles Dartiguelongue
0 siblings, 0 replies; 21+ messages in thread
From: Gilles Dartiguelongue @ 2014-12-07 23:08 UTC (permalink / raw
To: gentoo-commits
commit: 2b72686a4d9ee3dccb170f681ad6d12735870a40
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 7 22:43:32 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 7 23:08:32 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2b72686a
media-libs/cogl: add wayland backend support
---
.../cogl/{cogl-9999.ebuild => cogl-1.18.2.ebuild} | 41 +++++++++-------------
media-libs/cogl/cogl-9999.ebuild | 14 ++++++--
2 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-1.18.2.ebuild
similarity index 82%
copy from media-libs/cogl/cogl-9999.ebuild
copy to media-libs/cogl/cogl-1.18.2.ebuild
index 0199c34..83e1cfc 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-1.18.2.ebuild
@@ -7,23 +7,16 @@ CLUTTER_LA_PUNT="yes"
# Inherit gnome2 after clutter to download sources from gnome.org
inherit clutter gnome2 multilib virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
-HOMEPAGE="http://www.clutter-project.org/"
+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 +opengl +pango test" # doc profile
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
- IUSE="${IUSE} doc"
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
+IUSE="examples gles2 gstreamer +introspection +opengl +pango test wayland" # doc profile
+REQUIRED_USE="wayland? ( gles2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
@@ -44,6 +37,9 @@ COMMON_DEPEND="
introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
pango? ( >=x11-libs/pango-1.20.0[introspection?] )
+ wayland? (
+ >=dev-libs/wayland-1.1.90
+ media-libs/mesa[egl,wayland] )
"
# before clutter-1.7, cogl was part of clutter
RDEPEND="${COMMON_DEPEND}
@@ -58,33 +54,28 @@ DEPEND="${COMMON_DEPEND}
"
# Need classic mesa swrast for tests, llvmpipe causes a test failure
-
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- doc? (
- app-text/docbook-xml-dtd:4.1.2
- >=dev-util/gtk-doc-1.13 )"
-fi
+# For 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 || die
+ -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 || die
+ -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
+ # TODO: think about kms-egl, quartz, sdl
# 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
@@ -105,6 +96,8 @@ src_configure() {
$(use_enable introspection) \
$(use_enable pango cogl-pango) \
$(use_enable test unit-tests) \
+ $(use_enable wayland wayland-egl-platform) \
+ $(use_enable wayland wayland-egl-server) \
--disable-profile
# $(use_enable profile)
}
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index 0199c34..2ab4111 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -12,12 +12,13 @@ if [[ ${PV} = 9999 ]]; then
fi
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
-HOMEPAGE="http://www.clutter-project.org/"
+HOMEPAGE="http://www.cogl3d.org/"
LICENSE="MIT BSD"
SLOT="2.0/0" # subslot = .so version
# doc and profile disable for now due bugs #484750 and #483332
-IUSE="examples gles2 gstreamer +introspection +opengl +pango test" # doc profile
+IUSE="examples gles2 gstreamer +introspection +opengl +pango test wayland" # doc profile
+REQUIRED_USE="wayland? ( gles2 )"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
IUSE="${IUSE} doc"
@@ -44,6 +45,9 @@ COMMON_DEPEND="
introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
pango? ( >=x11-libs/pango-1.20.0[introspection?] )
+ wayland? (
+ >=dev-libs/wayland-1.1.90
+ media-libs/mesa[egl,wayland] )
"
# before clutter-1.7, cogl was part of clutter
RDEPEND="${COMMON_DEPEND}
@@ -58,6 +62,8 @@ DEPEND="${COMMON_DEPEND}
"
# Need classic mesa swrast for tests, llvmpipe causes a test failure
+# For some reason GL3 conformance test all fails again...
+RESTRICT="test"
if [[ ${PV} = 9999 ]]; then
DEPEND="${DEPEND}
@@ -84,7 +90,7 @@ src_prepare() {
}
src_configure() {
- # TODO: think about kms-egl, quartz, sdl, wayland
+ # TODO: think about kms-egl, quartz, sdl
# 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
@@ -105,6 +111,8 @@ src_configure() {
$(use_enable introspection) \
$(use_enable pango cogl-pango) \
$(use_enable test unit-tests) \
+ $(use_enable wayland wayland-egl-platform) \
+ $(use_enable wayland wayland-egl-server) \
--disable-profile
# $(use_enable profile)
}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2014-12-08 21:57 Gilles Dartiguelongue
0 siblings, 0 replies; 21+ messages in thread
From: Gilles Dartiguelongue @ 2014-12-08 21:57 UTC (permalink / raw
To: gentoo-commits
commit: bbc276313ab4716dda3e8aba285ecc8c8cc093bd
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 8 21:31:27 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 8 21:49:09 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bbc27631
media-libs/cogl: add support for kms backend
Can be used by mutter[kms]
---
media-libs/cogl/cogl-1.18.2.ebuild | 9 ++++++---
media-libs/cogl/cogl-9999.ebuild | 9 ++++++---
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/media-libs/cogl/cogl-1.18.2.ebuild b/media-libs/cogl/cogl-1.18.2.ebuild
index 83e1cfc..a30478d 100644
--- a/media-libs/cogl/cogl-1.18.2.ebuild
+++ b/media-libs/cogl/cogl-1.18.2.ebuild
@@ -14,7 +14,7 @@ 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 test wayland" # doc profile
+IUSE="examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile
REQUIRED_USE="wayland? ( gles2 )"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
@@ -22,7 +22,6 @@ 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
@@ -36,6 +35,9 @@ COMMON_DEPEND="
media-libs/gst-plugins-base:1.0 )
introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
+ kms? (
+ media-libs/mesa[gbm]
+ x11-libs/libdrm:= )
pango? ( >=x11-libs/pango-1.20.0[introspection?] )
wayland? (
>=dev-libs/wayland-1.1.90
@@ -75,7 +77,7 @@ src_prepare() {
}
src_configure() {
- # TODO: think about kms-egl, quartz, sdl
+ # TODO: think about quartz, sdl
# 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
@@ -94,6 +96,7 @@ src_configure() {
$(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
$(use_enable gstreamer cogl-gst) \
$(use_enable introspection) \
+ $(use_enable kms kms-egl-platform) \
$(use_enable pango cogl-pango) \
$(use_enable test unit-tests) \
$(use_enable wayland wayland-egl-platform) \
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index 2ab4111..b163549 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.cogl3d.org/"
LICENSE="MIT BSD"
SLOT="2.0/0" # subslot = .so version
# doc and profile disable for now due bugs #484750 and #483332
-IUSE="examples gles2 gstreamer +introspection +opengl +pango test wayland" # doc profile
+IUSE="examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile
REQUIRED_USE="wayland? ( gles2 )"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
@@ -30,7 +30,6 @@ 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
@@ -44,6 +43,9 @@ COMMON_DEPEND="
media-libs/gst-plugins-base:1.0 )
introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
+ kms? (
+ media-libs/mesa[gbm]
+ x11-libs/libdrm:= )
pango? ( >=x11-libs/pango-1.20.0[introspection?] )
wayland? (
>=dev-libs/wayland-1.1.90
@@ -90,7 +92,7 @@ src_prepare() {
}
src_configure() {
- # TODO: think about kms-egl, quartz, sdl
+ # TODO: think about quartz, sdl
# 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
@@ -109,6 +111,7 @@ src_configure() {
$(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
$(use_enable gstreamer cogl-gst) \
$(use_enable introspection) \
+ $(use_enable kms kms-egl-platform) \
$(use_enable pango cogl-pango) \
$(use_enable test unit-tests) \
$(use_enable wayland wayland-egl-platform) \
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2014-12-26 21:47 Gilles Dartiguelongue
0 siblings, 0 replies; 21+ messages in thread
From: Gilles Dartiguelongue @ 2014-12-26 21:47 UTC (permalink / raw
To: gentoo-commits
commit: 1246c4e89df7479c5962eff673b31d3f81deaf4b
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 26 21:47:15 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Dec 26 21:47:15 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1246c4e8
media-libs/cogl: moved to gentoo-x86
---
media-libs/cogl/cogl-1.18.2.ebuild | 128 -------------------------------------
1 file changed, 128 deletions(-)
diff --git a/media-libs/cogl/cogl-1.18.2.ebuild b/media-libs/cogl/cogl-1.18.2.ebuild
deleted file mode 100644
index a30478d..0000000
--- a/media-libs/cogl/cogl-1.18.2.ebuild
+++ /dev/null
@@ -1,128 +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
-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 +kms +opengl +pango test wayland" # doc profile
-REQUIRED_USE="wayland? ( gles2 )"
-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/libX11
- >=x11-libs/libXcomposite-0.4
- x11-libs/libXdamage
- x11-libs/libXext
- >=x11-libs/libXfixes-3
- >=x11-libs/libXrandr-1.2
- virtual/opengl
- gles2? ( 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 )
- kms? (
- media-libs/mesa[gbm]
- x11-libs/libdrm:= )
- pango? ( >=x11-libs/pango-1.20.0[introspection?] )
- wayland? (
- >=dev-libs/wayland-1.1.90
- media-libs/mesa[egl,wayland] )
-"
-# 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
-# For 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 quartz, sdl
- # 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) \
- $(use_enable introspection) \
- $(use_enable kms kms-egl-platform) \
- $(use_enable pango cogl-pango) \
- $(use_enable test unit-tests) \
- $(use_enable wayland wayland-egl-platform) \
- $(use_enable wayland wayland-egl-server) \
- --disable-profile
-# $(use_enable profile)
-}
-
-src_test() {
- # Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
- # NOTE: recheck if this is needed after every mesa bump
- if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then
- ewarn "Skipping tests because a binary OpenGL library is enabled. To"
- ewarn "run tests for ${PN}, you need to enable the Mesa library:"
- ewarn "# eselect opengl set xorg-x11"
- return
- fi
- LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
-}
-
-src_install() {
- DOCS="NEWS README"
- EXAMPLES="examples/{*.c,*.jpg}"
-
- clutter_src_install
-
- # Remove silly examples-data directory
- rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2015-04-18 9:00 Ole Reifschneider
0 siblings, 0 replies; 21+ messages in thread
From: Ole Reifschneider @ 2015-04-18 9:00 UTC (permalink / raw
To: gentoo-commits
commit: 7c7793d044ddfb1884d09f18b6a4b171206e045f
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 14 21:08:30 2015 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 21:08:30 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=7c7793d0
Add media-libs/cogl version 1.20.0
Package-Manager: portage-2.2.14
Manifest-Sign-Key: 7E8B4D42
.../cogl/{cogl-9999.ebuild => cogl-1.20.0.ebuild} | 33 ++++++----------------
media-libs/cogl/cogl-9999.ebuild | 4 +--
media-libs/cogl/metadata.xml | 1 +
3 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-1.20.0.ebuild
similarity index 85%
copy from media-libs/cogl/cogl-9999.ebuild
copy to media-libs/cogl/cogl-1.20.0.ebuild
index b163549..4fb544e 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-1.20.0.ebuild
@@ -1,30 +1,22 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.18.2-r1.ebuild,v 1.3 2015/03/15 13:28:41 pacho Exp $
EAPI="5"
CLUTTER_LA_PUNT="yes"
# Inherit gnome2 after clutter to download sources from gnome.org
inherit clutter gnome2 multilib virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
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
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
@@ -59,7 +51,7 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext
virtual/pkgconfig
test? (
- app-admin/eselect-opengl
+ app-eselect/eselect-opengl
media-libs/mesa[classic] )
"
@@ -67,25 +59,18 @@ 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
# 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 || die
+ -e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \
+ -e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \
+ -i Makefile.am Makefile.in || die
fi
gnome2_src_prepare
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index b163549..7cb2335 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -59,7 +59,7 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext
virtual/pkgconfig
test? (
- app-admin/eselect-opengl
+ app-eselect/eselect-opengl
media-libs/mesa[classic] )
"
diff --git a/media-libs/cogl/metadata.xml b/media-libs/cogl/metadata.xml
index 8ba9687..e3cc855 100644
--- a/media-libs/cogl/metadata.xml
+++ b/media-libs/cogl/metadata.xml
@@ -4,6 +4,7 @@
<herd>gnome</herd>
<use>
<flag name="gles2">Enable OpenGL ES 2.0 support</flag>
+ <flag name="kms">Enable KMS support.</flag>
<flag name="pango">Build cogl-pango library for <pkg>x11-libs/pango</pkg>
integration</flag>
</use>
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2015-06-09 9:16 Gilles Dartiguelongue
0 siblings, 0 replies; 21+ messages in thread
From: Gilles Dartiguelongue @ 2015-06-09 9:16 UTC (permalink / raw
To: gentoo-commits
commit: dbdf81b595190dfb3e8ab44dc7d0b7b2845f3e91
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 8 22:22:39 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Jun 8 22:22:39 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=dbdf81b5
media-libs/cogl: moved to gentoo-x86
media-libs/cogl/cogl-1.20.0.ebuild | 128 -------------------------------------
1 file changed, 128 deletions(-)
diff --git a/media-libs/cogl/cogl-1.20.0.ebuild b/media-libs/cogl/cogl-1.20.0.ebuild
deleted file mode 100644
index 4fb544e..0000000
--- a/media-libs/cogl/cogl-1.20.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.18.2-r1.ebuild,v 1.3 2015/03/15 13:28:41 pacho Exp $
-
-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 +kms +opengl +pango test wayland" # doc profile
-REQUIRED_USE="wayland? ( gles2 )"
-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/libX11
- >=x11-libs/libXcomposite-0.4
- x11-libs/libXdamage
- x11-libs/libXext
- >=x11-libs/libXfixes-3
- >=x11-libs/libXrandr-1.2
- virtual/opengl
- gles2? ( 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 )
- kms? (
- media-libs/mesa[gbm]
- x11-libs/libdrm:= )
- pango? ( >=x11-libs/pango-1.20.0[introspection?] )
- wayland? (
- >=dev-libs/wayland-1.1.90
- media-libs/mesa[egl,wayland] )
-"
-# 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-eselect/eselect-opengl
- media-libs/mesa[classic] )
-"
-
-# Need classic mesa swrast for tests, llvmpipe causes a test failure
-# For 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 quartz, sdl
- # 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) \
- $(use_enable introspection) \
- $(use_enable kms kms-egl-platform) \
- $(use_enable pango cogl-pango) \
- $(use_enable test unit-tests) \
- $(use_enable wayland wayland-egl-platform) \
- $(use_enable wayland wayland-egl-server) \
- --disable-profile
-# $(use_enable profile)
-}
-
-src_test() {
- # Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
- # NOTE: recheck if this is needed after every mesa bump
- if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then
- ewarn "Skipping tests because a binary OpenGL library is enabled. To"
- ewarn "run tests for ${PN}, you need to enable the Mesa library:"
- ewarn "# eselect opengl set xorg-x11"
- return
- fi
- LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
-}
-
-src_install() {
- DOCS="NEWS README"
- EXAMPLES="examples/{*.c,*.jpg}"
-
- clutter_src_install
-
- # Remove silly examples-data directory
- rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2015-09-13 22:03 Ole Reifschneider
0 siblings, 0 replies; 21+ messages in thread
From: Ole Reifschneider @ 2015-09-13 22:03 UTC (permalink / raw
To: gentoo-commits
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:= )
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2016-01-30 17:33 Priit Laes
0 siblings, 0 replies; 21+ messages in thread
From: Priit Laes @ 2016-01-30 17:33 UTC (permalink / raw
To: gentoo-commits
commit: 3e3af12ef71fbf1dbc1a54414938e45c8607ffbe
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sat Jan 30 17:29:52 2016 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sat Jan 30 17:29:52 2016 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=3e3af12e
media-libs/cogl: Update live ebuild to not use removed clutter eclass
media-libs/cogl/cogl-9999.ebuild | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index 10d4c6d..b1e1c85 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -3,10 +3,9 @@
# $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
+inherit gnome2 multilib virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -53,7 +52,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
@@ -134,9 +134,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
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
@ 2018-01-12 14:00 Dennis Lamm
0 siblings, 0 replies; 21+ messages in thread
From: Dennis Lamm @ 2018-01-12 14:00 UTC (permalink / raw
To: gentoo-commits
commit: 37512cdca637e9afe0df7eace764cec1fd348679
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 14:00:11 2018 +0000
Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 14:00:11 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=37512cdc
media-libs/cogl: drop old
Package-Manager: Portage-2.3.13, Repoman-2.3.3
media-libs/cogl/cogl-1.21.2.ebuild | 132 -------------------------------------
1 file changed, 132 deletions(-)
diff --git a/media-libs/cogl/cogl-1.21.2.ebuild b/media-libs/cogl/cogl-1.21.2.ebuild
deleted file mode 100644
index 984b93dd..00000000
--- a/media-libs/cogl/cogl-1.21.2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-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="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 )
- || ( gles2 opengl )"
-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/libX11
- >=x11-libs/libXcomposite-0.4
- x11-libs/libXdamage
- x11-libs/libXext
- >=x11-libs/libXfixes-3
- >=x11-libs/libXrandr-1.2
- virtual/opengl
- gles2? ( 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:= )
- kms? (
- media-libs/mesa[gbm]
- x11-libs/libdrm:= )
- pango? ( >=x11-libs/pango-1.20.0[introspection?] )
- wayland? (
- >=dev-libs/wayland-1.1.90
- media-libs/mesa[egl,wayland] )
-"
-# 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-eselect/eselect-opengl
- media-libs/mesa[classic] )
-"
-
-# Need classic mesa swrast for tests, llvmpipe causes a test failure
-# For 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 quartz, sdl
- # 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) \
- $(use_enable introspection) \
- $(use_enable kms kms-egl-platform) \
- $(use_enable pango cogl-pango) \
- $(use_enable test unit-tests) \
- $(use_enable wayland wayland-egl-platform) \
- $(use_enable wayland wayland-egl-server) \
- --disable-profile
-# $(use_enable profile)
-}
-
-src_test() {
- # Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
- # NOTE: recheck if this is needed after every mesa bump
- if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then
- ewarn "Skipping tests because a binary OpenGL library is enabled. To"
- ewarn "run tests for ${PN}, you need to enable the Mesa library:"
- ewarn "# eselect opengl set xorg-x11"
- return
- fi
- LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
-}
-
-src_install() {
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins examples/{*.c,*.jpg}
- fi
-
- gnome2_src_install
-
- # Remove silly examples-data directory
- rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
end of thread, other threads:[~2018-01-12 14:00 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-01 4:39 [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2011-10-18 7:37 Alexandre Restovtsev
2011-10-29 19:41 Alexandre Restovtsev
2012-09-15 7:53 Alexandre Rostovtsev
2012-09-16 7:44 Alexandre Rostovtsev
2012-10-27 19:40 Gilles Dartiguelongue
2012-12-19 0:39 Alexandre Rostovtsev
2013-01-19 21:38 Alexandre Rostovtsev
2013-03-15 7:38 Priit Laes
2013-12-19 23:40 Gilles Dartiguelongue
2014-04-15 22:05 Gilles Dartiguelongue
2014-10-12 23:19 Gilles Dartiguelongue
2014-11-03 23:24 Gilles Dartiguelongue
2014-12-07 23:08 Gilles Dartiguelongue
2014-12-08 21:57 Gilles Dartiguelongue
2014-12-26 21:47 Gilles Dartiguelongue
2015-04-18 9:00 Ole Reifschneider
2015-06-09 9:16 Gilles Dartiguelongue
2015-09-13 22:03 Ole Reifschneider
2016-01-30 17:33 Priit Laes
2018-01-12 14:00 Dennis Lamm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox