[gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
commit: 37512cdca637e9afe0df7eace764cec1fd348679
Author: Dennis Lamm gentoo org>
AuthorDate: Fri Jan 12 14:00:11 2018 +
Commit: Dennis Lamm gentoo org>
CommitDate: Fri Jan 12 14:00:11 2018 +
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..
--- 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}
- !
[gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
commit: 3e3af12ef71fbf1dbc1a54414938e45c8607ffbe
Author: Priit Laes plaes org>
AuthorDate: Sat Jan 30 17:29:52 2016 +
Commit: Priit Laes plaes org>
CommitDate: Sat Jan 30 17:29:52 2016 +
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-.ebuild | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/media-libs/cogl/cogl-.ebuild b/media-libs/cogl/cogl-.ebuild
index 10d4c6d..b1e1c85 100644
--- a/media-libs/cogl/cogl-.ebuild
+++ b/media-libs/cogl/cogl-.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} = ]]; then
inherit gnome2-live
fi
@@ -53,7 +52,8 @@ COMMON_DEPEND="
"
# before clutter-1.7, cogl was part of clutter
RDEPEND="${COMMON_DEPEND}
- !
[gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
commit: 9ef14574166a7576be006584ca5c6651a6652f77
Author: Ole Reifschneider gentoo org>
AuthorDate: Sun Sep 13 18:20:22 2015 +
Commit: Ole Reifschneider gentoo org>
CommitDate: Sun Sep 13 18:20:22 2015 +
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-.ebuild => cogl-1.21.2.ebuild} | 45 --
media-libs/cogl/cogl-.ebuild | 2 +-
2 files changed, 18 insertions(+), 29 deletions(-)
diff --git a/media-libs/cogl/cogl-.ebuild
b/media-libs/cogl/cogl-1.21.2.ebuild
similarity index 82%
copy from media-libs/cogl/cogl-.ebuild
copy to media-libs/cogl/cogl-1.21.2.ebuild
index df06afc..984b93d 100644
--- a/media-libs/cogl/cogl-.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} = ]]; 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} = ]]; 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}
-
[gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
commit: dbdf81b595190dfb3e8ab44dc7d0b7b2845f3e91
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Mon Jun 8 22:22:39 2015 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Mon Jun 8 22:22:39 2015 +
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..000
--- 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
-
[gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
commit: 7c7793d044ddfb1884d09f18b6a4b171206e045f
Author: Ole Reifschneider tranquility AT gentoo DOT org
AuthorDate: Tue Apr 14 21:08:30 2015 +
Commit: Ole Reifschneider tranquility AT gentoo DOT org
CommitDate: Tue Apr 14 21:08:30 2015 +
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-.ebuild = cogl-1.20.0.ebuild} | 33 ++
media-libs/cogl/cogl-.ebuild | 4 +--
media-libs/cogl/metadata.xml | 1 +
3 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/media-libs/cogl/cogl-.ebuild
b/media-libs/cogl/cogl-1.20.0.ebuild
similarity index 85%
copy from media-libs/cogl/cogl-.ebuild
copy to media-libs/cogl/cogl-1.20.0.ebuild
index b163549..4fb544e 100644
--- a/media-libs/cogl/cogl-.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} = ]]; 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} = ]]; 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} = ]]; 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-.ebuild b/media-libs/cogl/cogl-.ebuild
index b163549..7cb2335 100644
--- a/media-libs/cogl/cogl-.ebuild
+++ b/media-libs/cogl/cogl-.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 @@
herdgnome/herd
use
flag name=gles2Enable OpenGL ES 2.0 support/flag
+ flag name=kmsEnable KMS support./flag
flag name=pangoBuild cogl-pango library for pkgx11-libs/pango/pkg
integration/flag
/use
[gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
commit: 1246c4e89df7479c5962eff673b31d3f81deaf4b
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Fri Dec 26 21:47:15 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Fri Dec 26 21:47:15 2014 +
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..000
--- 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:
-
[gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
commit: bbc276313ab4716dda3e8aba285ecc8c8cc093bd
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Mon Dec 8 21:31:27 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Mon Dec 8 21:49:09 2014 +
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-.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-.ebuild b/media-libs/cogl/cogl-.ebuild
index 2ab4111..b163549 100644
--- a/media-libs/cogl/cogl-.ebuild
+++ b/media-libs/cogl/cogl-.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} = ]]; 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) \
[gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
commit: 2b72686a4d9ee3dccb170f681ad6d12735870a40
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun Dec 7 22:43:32 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun Dec 7 23:08:32 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2b72686a
media-libs/cogl: add wayland backend support
---
.../cogl/{cogl-.ebuild = cogl-1.18.2.ebuild} | 41 +-
media-libs/cogl/cogl-.ebuild | 14 ++--
2 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/media-libs/cogl/cogl-.ebuild
b/media-libs/cogl/cogl-1.18.2.ebuild
similarity index 82%
copy from media-libs/cogl/cogl-.ebuild
copy to media-libs/cogl/cogl-1.18.2.ebuild
index 0199c34..83e1cfc 100644
--- a/media-libs/cogl/cogl-.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} = ]]; 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} = ]]; 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} = ]]; 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-.ebuild b/media-libs/cogl/cogl-.ebuild
index 0199c34..2ab4111 100644
--- a/media-libs/cogl/cogl-.ebuild
+++ b/media-libs/cogl/cogl-.ebuild
@@ -12,12 +12,13 @@ if [[ ${PV} = ]]; 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} = ]]; then
KEYWORDS=
IUSE=${IUSE} doc
@@ -44,6 +45,9 @@ COMMON_DEPEND=
[gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
commit: c76181e80a90081d8bf0ab6d70fe097e4469fe25
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Mon Nov 3 23:21:25 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Mon Nov 3 23:23:57 2014 +
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-.ebuild | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/media-libs/cogl/cogl-.ebuild b/media-libs/cogl/cogl-.ebuild
index 14e5adf..0199c34 100644
--- a/media-libs/cogl/cogl-.ebuild
+++ b/media-libs/cogl/cogl-.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} = ]]; 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)
}
[gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
commit: 0c243292f6116ac22904a50a2a3d9264f08c0cc4
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun Oct 12 21:56:36 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun Oct 12 23:19:06 2014 +
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..000
--- 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
[gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
commit: 4fd35bb40d2b48f3ebe7fb90574f6068e07aa0b2
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Mon Apr 14 20:57:19 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Tue Apr 15 20:33:33 2014 +
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-.ebuild = cogl-1.18.0.ebuild} | 26 ++
media-libs/cogl/cogl-.ebuild | 7 +++---
2 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/media-libs/cogl/cogl-.ebuild
b/media-libs/cogl/cogl-1.18.0.ebuild
similarity index 89%
copy from media-libs/cogl/cogl-.ebuild
copy to media-libs/cogl/cogl-1.18.0.ebuild
index 18ee627..882c317 100644
--- a/media-libs/cogl/cogl-.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} = ]]; 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} = ]]; 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} = ]]; 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-.ebuild b/media-libs/cogl/cogl-.ebuild
index 18ee627..14e5adf 100644
--- a/media-libs/cogl/cogl-.ebuild
+++ b/media-libs/cogl/cogl-.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} = ]]; 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} = ]]; then
