* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/, profiles/
@ 2013-12-01 11:30 Gilles Dartiguelongue
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-01 11:30 UTC (permalink / raw
To: gentoo-commits
commit: e9bb6342852154a06484222758c85f3b56976fc6
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 29 20:02:27 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 1 11:30:05 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e9bb6342
media-libs/cogl: 1.14.1_pre20130901-r1 → 1.16.0
---
.../{cogl-1.13.4.ebuild => cogl-1.16.0.ebuild} | 61 +++++++----
media-libs/cogl/cogl-9999.ebuild | 112 +++++++++++++--------
profiles/package.use.mask | 7 ++
3 files changed, 115 insertions(+), 65 deletions(-)
diff --git a/media-libs/cogl/cogl-1.13.4.ebuild b/media-libs/cogl/cogl-1.16.0.ebuild
similarity index 63%
rename from media-libs/cogl/cogl-1.13.4.ebuild
rename to media-libs/cogl/cogl-1.16.0.ebuild
index 0899ddd..9e4f292 100644
--- a/media-libs/cogl/cogl-1.13.4.ebuild
+++ b/media-libs/cogl/cogl-1.16.0.ebuild
@@ -6,19 +6,19 @@ EAPI="5"
CLUTTER_LA_PUNT="yes"
# Inherit gnome2 after clutter to download sources from gnome.org
-inherit eutils clutter gnome2 multilib virtualx
+inherit 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"
+SLOT="1.0/12" # 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"
-# XXX: need uprof for optional profiling support
COMMON_DEPEND="
- >=dev-libs/glib-2.32.0:2
+ >=dev-libs/glib-2.32:2
x11-libs/cairo:=
>=x11-libs/gdk-pixbuf-2:2
x11-libs/libdrm:=
@@ -26,10 +26,13 @@ COMMON_DEPEND="
>=x11-libs/libXcomposite-0.4
x11-libs/libXdamage
x11-libs/libXext
- x11-libs/libXrandr
>=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?] )
@@ -41,32 +44,56 @@ 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
+ test? (
+ app-admin/eselect-opengl
media-libs/mesa[classic] )
"
+# doc? ( >=dev-util/gtk-doc-1.13 )
# Need classic mesa swrast for tests, llvmpipe causes a test failure
+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() {
- # XXX: think about kms-egl, quartz, sdl, wayland
+ # 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-profile \
--disable-maintainer-flags \
--enable-cairo \
--enable-deprecated \
--enable-gdk-pixbuf \
--enable-glib \
- $(use_enable doc gtk-doc) \
+ --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 pango cogl-pango) \
+ $(use_enable test unit-tests) \
+ --disable-profile
+# $(use_enable doc gtk-doc) \
+# $(use_enable profile)
}
src_test() {
@@ -90,13 +117,3 @@ 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
-}
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index 4a4da33..acf6587 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -15,16 +15,18 @@ 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/11"
-IUSE="doc examples +introspection +opengl gles2 +pango"
+SLOT="1.0/12" # 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 ~mips ~ppc ~ppc64 ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
fi
-# XXX: need uprof for optional profiling support
-COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2
x11-libs/cairo:=
>=x11-libs/gdk-pixbuf-2:2
x11-libs/libdrm:=
@@ -33,50 +35,81 @@ COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
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-0.9.5 )
- pango? ( >=x11-libs/pango-1.20.0[introspection?] )"
+ 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? ( app-text/docbook-xml-dtd:4.1.2
- >=dev-util/gtk-doc-1.13 )
- test? ( app-admin/eselect-opengl
- media-libs/mesa[classic] )"
+ test? (
+ 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
+
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
- --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)
- "$(usex gles2 --with-default-driver=$(usex opengl gl gles2 ) "")"
- --enable-glib
- --enable-deprecated
- $(use_enable introspection)
- $(use_enable pango cogl-pango)
- $(use_enable doc gtk-doc)"
- # Really need --enable-gtk-doc for docs
+ # 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
@@ -90,18 +123,11 @@ src_test() {
}
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
-}
diff --git a/profiles/package.use.mask b/profiles/package.use.mask
index 55d7022..b6a6f17 100644
--- a/profiles/package.use.mask
+++ b/profiles/package.use.mask
@@ -6,3 +6,10 @@
# gjs: tests fail and support for it was purely and simply removed in master/1.9
# python2_6: unit tests fail for this abi, must report usptream
dev-libs/libpeas gjs python_targets_python2_6
+
+# Gilles Dartiguelongue <eva@gentoo.org> (29 Nov 2013)
+# Gstreamer support fails to build due to libtool shortcomings when using
+# an intermediate library as a dependency of another libtool target dependency.
+# Since this is new and unused yet, keep it masked for now and check
+# with upstream if there is something that can be done to fix the issue.
+media-libs/cogl gstreamer
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/, profiles/
@ 2013-12-24 16:57 Gilles Dartiguelongue
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-24 16:57 UTC (permalink / raw
To: gentoo-commits
commit: e9141fcc43d0e3a660d044c01fc03add6cdd6654
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 23:29:04 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 23:29:04 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e9141fcc
media-libs/cogl: moved to gentoo-x86
---
media-libs/cogl/cogl-1.16.0.ebuild | 119 -------------------------------------
profiles/package.use.mask | 7 ---
2 files changed, 126 deletions(-)
diff --git a/media-libs/cogl/cogl-1.16.0.ebuild b/media-libs/cogl/cogl-1.16.0.ebuild
deleted file mode 100644
index 102ec1f..0000000
--- a/media-libs/cogl/cogl-1.16.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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 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" # 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] )
-"
-# doc? ( >=dev-util/gtk-doc-1.13 )
-# Need classic mesa swrast for tests, llvmpipe causes a test failure
-
-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
-}
diff --git a/profiles/package.use.mask b/profiles/package.use.mask
index b6a6f17..55d7022 100644
--- a/profiles/package.use.mask
+++ b/profiles/package.use.mask
@@ -6,10 +6,3 @@
# gjs: tests fail and support for it was purely and simply removed in master/1.9
# python2_6: unit tests fail for this abi, must report usptream
dev-libs/libpeas gjs python_targets_python2_6
-
-# Gilles Dartiguelongue <eva@gentoo.org> (29 Nov 2013)
-# Gstreamer support fails to build due to libtool shortcomings when using
-# an intermediate library as a dependency of another libtool target dependency.
-# Since this is new and unused yet, keep it masked for now and check
-# with upstream if there is something that can be done to fix the issue.
-media-libs/cogl gstreamer
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-12-24 16:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-24 16:57 [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/, profiles/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2013-12-01 11:30 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox