* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2016-01-31 18:26 Pacho Ramos
0 siblings, 0 replies; 22+ messages in thread
From: Pacho Ramos @ 2016-01-31 18:26 UTC (permalink / raw
To: gentoo-commits
commit: 45604bc017aa87a95bf1a761c388cf01d47ccc7a
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 18:22:39 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 18:22:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45604bc0
media-libs/cogl: Stop applying buggy patch (#573514 by Pascal Flöschel)
Package-Manager: portage-2.2.27
media-libs/cogl/cogl-1.22.0-r2.ebuild | 141 ++++++++++++++++++++++++++++++++++
1 file changed, 141 insertions(+)
diff --git a/media-libs/cogl/cogl-1.22.0-r2.ebuild b/media-libs/cogl/cogl-1.22.0-r2.ebuild
new file mode 100644
index 0000000..eb8ad4a
--- /dev/null
+++ b/media-libs/cogl/cogl-1.22.0-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit eutils 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 to bugs #484750 and #483332
+IUSE="examples gles2 gstreamer +introspection +kms +opengl +pango test video_cards_fglrx 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() {
+ # Upstream fixes from 1.22 branch
+ # kms-winsys: don't wait for a flip when page flipping fails
+ epatch "${FILESDIR}"/${P}-wait-flip.patch
+
+ # Let cogl work with fglrx driver, bug #567168
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756306
+ use video_cards_fglrx && epatch "${FILESDIR}"/${PN}-1.22.0-fglrx.patch
+
+ # 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] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2017-07-01 15:24 Alexis Ballier
0 siblings, 0 replies; 22+ messages in thread
From: Alexis Ballier @ 2017-07-01 15:24 UTC (permalink / raw
To: gentoo-commits
commit: 0141f64a41d91ecb0f1726d98c2f8f8d0dd9ef75
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 1 14:19:30 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Jul 1 15:24:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0141f64a
media-libs/cogl: keyword ~arm64
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/cogl/cogl-1.22.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/cogl/cogl-1.22.2.ebuild b/media-libs/cogl/cogl-1.22.2.ebuild
index 3446370c5dd..b7ece30963a 100644
--- a/media-libs/cogl/cogl-1.22.2.ebuild
+++ b/media-libs/cogl/cogl-1.22.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@ REQUIRED_USE="
wayland? ( gles2 )
|| ( gles2 opengl )
"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2017-08-26 10:07 Gilles Dartiguelongue
0 siblings, 0 replies; 22+ messages in thread
From: Gilles Dartiguelongue @ 2017-08-26 10:07 UTC (permalink / raw
To: gentoo-commits
commit: e94a9a76d2e0933982cc643ed94a5153d2fe8e8c
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 08:24:11 2017 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 10:06:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e94a9a76
media-libs/cogl: cleanup old revisions
Package-Manager: Portage-2.3.8, Repoman-2.3.3
media-libs/cogl/Manifest | 1 -
media-libs/cogl/cogl-1.20.0.ebuild | 131 -------------------------------
media-libs/cogl/cogl-1.22.0-r1.ebuild | 143 ----------------------------------
media-libs/cogl/cogl-1.22.0-r2.ebuild | 140 ---------------------------------
media-libs/cogl/cogl-1.22.0.ebuild | 132 -------------------------------
5 files changed, 547 deletions(-)
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 8c87210f7c9..929b6a8cb9e 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,3 +1,2 @@
-DIST cogl-1.20.0.tar.xz 1669620 SHA256 729e35495829e7d31fafa3358e47b743ba21a2b08ff9b6cd28fb74c0de91192b SHA512 a7c50072ef5660a4fff8d3843ede86178e5c4bcc635eb24c1e16f73422f57596b91a2c78a73a5e01f6f4b9c96509c7c648729f748b2fec4b8ad0f332cd5e0bd1 WHIRLPOOL 9756e8b0c1503ff9e06b926d82620692d0e22ac7acf68f90461d4ae982d758733de47084fa4a80c531500f47b2ff109e07b3f0300aa9fcaf5b05f607a8252fa1
DIST cogl-1.22.0.tar.xz 1654120 SHA256 689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91 SHA512 b19edced4282bd2b828357391fd6175feb483acfec87e344b7719215924dc8996dc8162d7b39d62a108d4f3ebd426caeefeab4e16b6c1962cc3383c239d6c359 WHIRLPOOL 4e77a005e51b928668be8efb85a27f679fa653d8d23ff078256141a452aa880c2d228b30d3cb406ae940d255d626f1a57741f3647a6efbb890a5f083b07bd62a
DIST cogl-1.22.2.tar.xz 1682360 SHA256 39a718cdb64ea45225a7e94f88dddec1869ab37a21b339ad058a9d898782c00d SHA512 2ec99f5ff22683d12925b9a1f748387b47c4506aaf3c5afec851b3b6fe6b7cdfd211fb7e4359bd7a1d1b7cb3cb7fbd257efbcb7d2941d0f133a60bad1c9645e3 WHIRLPOOL 548deef9a92fba1ee183f84eb581add8f366ecb0829467025a48c0eb26e85f86ee85dbffded1174fc426f2e85ed5ede3aea75131dfe6a0df547d1440c2b0e53e
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 92054f6880e..00000000000
--- a/media-libs/cogl/cogl-1.20.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-}
diff --git a/media-libs/cogl/cogl-1.22.0-r1.ebuild b/media-libs/cogl/cogl-1.22.0-r1.ebuild
deleted file mode 100644
index 8d58f736b12..00000000000
--- a/media-libs/cogl/cogl-1.22.0-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils 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 to bugs #484750 and #483332
-IUSE="examples gles2 gstreamer +introspection +kms +opengl +pango test video_cards_fglrx 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() {
- # Upstream fixes from 1.22 branch
- # winsys-egl-kms: bypass initial output setup if kms fd passed in
- epatch "${FILESDIR}"/${P}-initial-output.patch
-
- # kms-winsys: don't wait for a flip when page flipping fails
- epatch "${FILESDIR}"/${P}-wait-flip.patch
-
- # Let cogl work with fglrx driver, bug #567168
- # https://bugzilla.gnome.org/show_bug.cgi?id=756306
- use video_cards_fglrx && epatch "${FILESDIR}"/${PN}-1.22.0-fglrx.patch
-
- # 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
-}
diff --git a/media-libs/cogl/cogl-1.22.0-r2.ebuild b/media-libs/cogl/cogl-1.22.0-r2.ebuild
deleted file mode 100644
index 485f324edd2..00000000000
--- a/media-libs/cogl/cogl-1.22.0-r2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils 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 to bugs #484750 and #483332
-IUSE="examples gles2 gstreamer +introspection +kms +opengl +pango test video_cards_fglrx 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() {
- # Upstream fixes from 1.22 branch
- # kms-winsys: don't wait for a flip when page flipping fails
- epatch "${FILESDIR}"/${P}-wait-flip.patch
-
- # Let cogl work with fglrx driver, bug #567168
- # https://bugzilla.gnome.org/show_bug.cgi?id=756306
- use video_cards_fglrx && epatch "${FILESDIR}"/${PN}-1.22.0-fglrx.patch
-
- # 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
-}
diff --git a/media-libs/cogl/cogl-1.22.0.ebuild b/media-libs/cogl/cogl-1.22.0.ebuild
deleted file mode 100644
index 31e9262f7b9..00000000000
--- a/media-libs/cogl/cogl-1.22.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2017-08-26 10:07 Gilles Dartiguelongue
0 siblings, 0 replies; 22+ messages in thread
From: Gilles Dartiguelongue @ 2017-08-26 10:07 UTC (permalink / raw
To: gentoo-commits
commit: 99153f0e17624c2f6731302b9d39b96dcebaabaf
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 08:28:22 2017 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 10:06:59 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99153f0e
media-libs/cogl: update HOMEPAGE and drop unused eutils inherit
Package-Manager: Portage-2.3.8, Repoman-2.3.3
media-libs/cogl/Manifest | 1 -
media-libs/cogl/cogl-1.22.2.ebuild | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 929b6a8cb9e..2ba1493df37 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,2 +1 @@
-DIST cogl-1.22.0.tar.xz 1654120 SHA256 689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91 SHA512 b19edced4282bd2b828357391fd6175feb483acfec87e344b7719215924dc8996dc8162d7b39d62a108d4f3ebd426caeefeab4e16b6c1962cc3383c239d6c359 WHIRLPOOL 4e77a005e51b928668be8efb85a27f679fa653d8d23ff078256141a452aa880c2d228b30d3cb406ae940d255d626f1a57741f3647a6efbb890a5f083b07bd62a
DIST cogl-1.22.2.tar.xz 1682360 SHA256 39a718cdb64ea45225a7e94f88dddec1869ab37a21b339ad058a9d898782c00d SHA512 2ec99f5ff22683d12925b9a1f748387b47c4506aaf3c5afec851b3b6fe6b7cdfd211fb7e4359bd7a1d1b7cb3cb7fbd257efbcb7d2941d0f133a60bad1c9645e3 WHIRLPOOL 548deef9a92fba1ee183f84eb581add8f366ecb0829467025a48c0eb26e85f86ee85dbffded1174fc426f2e85ed5ede3aea75131dfe6a0df547d1440c2b0e53e
diff --git a/media-libs/cogl/cogl-1.22.2.ebuild b/media-libs/cogl/cogl-1.22.2.ebuild
index b7ece30963a..0419b0b7388 100644
--- a/media-libs/cogl/cogl-1.22.2.ebuild
+++ b/media-libs/cogl/cogl-1.22.2.ebuild
@@ -3,10 +3,10 @@
EAPI=6
-inherit eutils gnome2 multilib virtualx
+inherit gnome2 multilib virtualx
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
-HOMEPAGE="http://www.cogl3d.org/"
+HOMEPAGE="https://www.cogl3d.org/"
LICENSE="MIT BSD"
SLOT="1.0/20" # subslot = .so version
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2018-10-06 22:37 Mart Raudsepp
0 siblings, 0 replies; 22+ messages in thread
From: Mart Raudsepp @ 2018-10-06 22:37 UTC (permalink / raw
To: gentoo-commits
commit: f4aab3e9ed9c835d562232e130a4fc1588dd7406
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 6 22:34:58 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Oct 6 22:36:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4aab3e9
media-libs/cogl: add explicit build dep on glib-utils
Closes: https://bugs.gentoo.org/667308
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
media-libs/cogl/cogl-1.22.2.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-libs/cogl/cogl-1.22.2.ebuild b/media-libs/cogl/cogl-1.22.2.ebuild
index 97738b3c596..0a029d23e07 100644
--- a/media-libs/cogl/cogl-1.22.2.ebuild
+++ b/media-libs/cogl/cogl-1.22.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -48,6 +48,7 @@ RDEPEND="${COMMON_DEPEND}
!<media-libs/clutter-1.7
"
DEPEND="${COMMON_DEPEND}
+ dev-util/glib-utils
>=dev-util/gtk-doc-am-1.13
>=sys-devel/gettext-0.19
virtual/pkgconfig
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2019-04-25 18:14 Pacho Ramos
0 siblings, 0 replies; 22+ messages in thread
From: Pacho Ramos @ 2019-04-25 18:14 UTC (permalink / raw
To: gentoo-commits
commit: 932e728eca8ce21059fcc165911430a5deaa43e0
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 25 18:07:28 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 18:14:51 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=932e728e
media-libs/cogl: Bump to 1.22.4
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
media-libs/cogl/Manifest | 1 +
media-libs/cogl/cogl-1.22.4.ebuild | 133 +++++++++++++++++++++++++++++++++++++
2 files changed, 134 insertions(+)
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 4c6116f1308..70342c8a200 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1 +1,2 @@
DIST cogl-1.22.2.tar.xz 1682360 BLAKE2B f5a1543266bd87c6835322d5dbf501ec4f9fec52cc18d73d140323fef2f1b6b2293b5998bc8914b0a8cb514e7fefe5a1500793e1c7d8b5e0a4365fe8ef13233f SHA512 2ec99f5ff22683d12925b9a1f748387b47c4506aaf3c5afec851b3b6fe6b7cdfd211fb7e4359bd7a1d1b7cb3cb7fbd257efbcb7d2941d0f133a60bad1c9645e3
+DIST cogl-1.22.4.tar.xz 1723856 BLAKE2B 9e8532e3a0d17662042e2e61e45a7ddab6d3a35c7fbb070426b574292d7d3ed81e42a05cde9ab9a58ecda4eb6d560d0dca6c44b7791bba195e2ab2a33e8c0dc1 SHA512 85f3af49c16dd2e545a3b91c076ac10107a4b9d0dc785cefe489e91eabdd82837f732685f1f0dca1695fc2f8095f42d5f30f145b659eb4295964787f06c1e37a
diff --git a/media-libs/cogl/cogl-1.22.4.ebuild b/media-libs/cogl/cogl-1.22.4.ebuild
new file mode 100644
index 00000000000..7061df2b3cd
--- /dev/null
+++ b/media-libs/cogl/cogl-1.22.4.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2 multilib virtualx
+
+DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
+HOMEPAGE="https://www.cogl3d.org/"
+
+LICENSE="MIT BSD"
+SLOT="1.0/20" # subslot = .so version
+
+# doc and profile disable for now due to bugs #484750 and #483332
+IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile
+REQUIRED_USE="
+ wayland? ( gles2 )
+ || ( gles2 opengl )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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/glib-utils
+ >=dev-util/gtk-doc-am-1.13
+ >=sys-devel/gettext-0.19
+ 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 debug) \
+ $(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
+ virtx emake check LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa"
+}
+
+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] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2019-11-17 17:51 Mart Raudsepp
0 siblings, 0 replies; 22+ messages in thread
From: Mart Raudsepp @ 2019-11-17 17:51 UTC (permalink / raw
To: gentoo-commits
commit: fc115d74f4ef6895c0ae06c65ff1cd11b9981592
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 17:50:53 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 17:51:21 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc115d74
media-libs/cogl: add missing mesa[egl] dep for USE=kms
If any EGL platform is enabled, it requires the EGL headers.
This includes kms-egl-platform, which also sets NEED_EGL in
configure.ac.
Remove rm -f option usage while here (it makes the `|| die`
useless and makes us not notice once this call isn't necessary
anymore).
Closes: https://bugs.gentoo.org/613728
Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
media-libs/cogl/cogl-1.22.4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/cogl/cogl-1.22.4.ebuild b/media-libs/cogl/cogl-1.22.4.ebuild
index 2191b69cd4a..12bd445b80f 100644
--- a/media-libs/cogl/cogl-1.22.4.ebuild
+++ b/media-libs/cogl/cogl-1.22.4.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="
media-libs/gst-plugins-base:1.0 )
introspection? ( >=dev-libs/gobject-introspection-1.34.2:= )
kms? (
- media-libs/mesa[gbm]
+ media-libs/mesa[egl,gbm]
x11-libs/libdrm:= )
pango? ( >=x11-libs/pango-1.20.0[introspection?] )
wayland? (
@@ -114,5 +114,5 @@ src_install() {
gnome2_src_install
# Remove silly examples-data directory
- rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
+ rm -rv "${ED}/usr/share/cogl/examples-data/" || die
}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2019-11-17 17:51 Mart Raudsepp
0 siblings, 0 replies; 22+ messages in thread
From: Mart Raudsepp @ 2019-11-17 17:51 UTC (permalink / raw
To: gentoo-commits
commit: f87e81997e158c6fed35169a281f88b4385c509a
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 17:45:59 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 17:51:21 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f87e8199
media-libs/cogl: drop unnecessary test deps with tests restricted
Bug: https://bugs.gentoo.org/692212
Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
media-libs/cogl/cogl-1.22.2.ebuild | 39 ++++++++++++--------------------------
media-libs/cogl/cogl-1.22.4.ebuild | 37 +++++++++++-------------------------
2 files changed, 23 insertions(+), 53 deletions(-)
diff --git a/media-libs/cogl/cogl-1.22.2.ebuild b/media-libs/cogl/cogl-1.22.2.ebuild
index 0a029d23e07..c3702f70dec 100644
--- a/media-libs/cogl/cogl-1.22.2.ebuild
+++ b/media-libs/cogl/cogl-1.22.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit gnome2 multilib virtualx
+inherit gnome2 multilib
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
HOMEPAGE="https://www.cogl3d.org/"
@@ -12,7 +12,7 @@ LICENSE="MIT BSD"
SLOT="1.0/20" # subslot = .so version
# doc and profile disable for now due to bugs #484750 and #483332
-IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile
+IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland" # doc profile
REQUIRED_USE="
wayland? ( gles2 )
|| ( gles2 opengl )
@@ -52,9 +52,6 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/gtk-doc-am-1.13
>=sys-devel/gettext-0.19
virtual/pkgconfig
- test? (
- app-eselect/eselect-opengl
- media-libs/mesa[classic] )
"
# Need classic mesa swrast for tests, llvmpipe causes a test failure
@@ -66,14 +63,14 @@ src_prepare() {
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
+ #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
}
@@ -101,25 +98,13 @@ src_configure() {
$(use_enable introspection) \
$(use_enable kms kms-egl-platform) \
$(use_enable pango cogl-pango) \
- $(use_enable test unit-tests) \
+ --disable-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
- virtx emake check LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa"
-}
-
src_install() {
if use examples; then
insinto /usr/share/doc/${PF}/examples
diff --git a/media-libs/cogl/cogl-1.22.4.ebuild b/media-libs/cogl/cogl-1.22.4.ebuild
index 7061df2b3cd..2191b69cd4a 100644
--- a/media-libs/cogl/cogl-1.22.4.ebuild
+++ b/media-libs/cogl/cogl-1.22.4.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit gnome2 multilib virtualx
+inherit gnome2 multilib
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
HOMEPAGE="https://www.cogl3d.org/"
@@ -12,7 +12,7 @@ LICENSE="MIT BSD"
SLOT="1.0/20" # subslot = .so version
# doc and profile disable for now due to bugs #484750 and #483332
-IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile
+IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland" # doc profile
REQUIRED_USE="
wayland? ( gles2 )
|| ( gles2 opengl )
@@ -52,9 +52,6 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/gtk-doc-am-1.13
>=sys-devel/gettext-0.19
virtual/pkgconfig
- test? (
- app-eselect/eselect-opengl
- media-libs/mesa[classic] )
"
# Need classic mesa swrast for tests, llvmpipe causes a test failure
@@ -66,14 +63,14 @@ src_prepare() {
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
+ #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
}
@@ -101,25 +98,13 @@ src_configure() {
$(use_enable introspection) \
$(use_enable kms kms-egl-platform) \
$(use_enable pango cogl-pango) \
- $(use_enable test unit-tests) \
+ --disable-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
- virtx emake check LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa"
-}
-
src_install() {
if use examples; then
insinto /usr/share/doc/${PF}/examples
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2019-11-23 19:45 Matt Turner
0 siblings, 0 replies; 22+ messages in thread
From: Matt Turner @ 2019-11-23 19:45 UTC (permalink / raw
To: gentoo-commits
commit: 26cca8c1e7ac922579646c13fa8ad6f5c0081403
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 18:21:20 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 19:44:00 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26cca8c1
media-libs/cogl: Restore -f in rm -rvf
Because of the next patch we need to run eautoreconf, which somehow
causes this directory to not exist in the install. The -f was removed in
fc115d74f4ef ("media-libs/cogl: add missing mesa[egl] dep for USE=kms").
The commit message states
Remove rm -f option usage while here (it makes the `|| die`
useless and makes us not notice once this call isn't necessary
anymore).
but cogl hasn't seen any real work in about three years, so I don't
think that's particularly important or likely to happen.
Bug: https://bugs.gentoo.org/692212
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/cogl/cogl-1.22.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/cogl/cogl-1.22.4.ebuild b/media-libs/cogl/cogl-1.22.4.ebuild
index 12bd445b80f..3265c8399cc 100644
--- a/media-libs/cogl/cogl-1.22.4.ebuild
+++ b/media-libs/cogl/cogl-1.22.4.ebuild
@@ -114,5 +114,5 @@ src_install() {
gnome2_src_install
# Remove silly examples-data directory
- rm -rv "${ED}/usr/share/cogl/examples-data/" || die
+ rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2019-12-23 22:23 Mart Raudsepp
0 siblings, 0 replies; 22+ messages in thread
From: Mart Raudsepp @ 2019-12-23 22:23 UTC (permalink / raw
To: gentoo-commits
commit: 3e3e138a2371a6bdb57940ae2fc1817f37191423
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 22:05:53 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 22:22:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e3e138a
media-libs/cogl: remove old
Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
media-libs/cogl/Manifest | 1 -
media-libs/cogl/cogl-1.22.2.ebuild | 123 -------------------------------------
2 files changed, 124 deletions(-)
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 70342c8a200..490e821584d 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,2 +1 @@
-DIST cogl-1.22.2.tar.xz 1682360 BLAKE2B f5a1543266bd87c6835322d5dbf501ec4f9fec52cc18d73d140323fef2f1b6b2293b5998bc8914b0a8cb514e7fefe5a1500793e1c7d8b5e0a4365fe8ef13233f SHA512 2ec99f5ff22683d12925b9a1f748387b47c4506aaf3c5afec851b3b6fe6b7cdfd211fb7e4359bd7a1d1b7cb3cb7fbd257efbcb7d2941d0f133a60bad1c9645e3
DIST cogl-1.22.4.tar.xz 1723856 BLAKE2B 9e8532e3a0d17662042e2e61e45a7ddab6d3a35c7fbb070426b574292d7d3ed81e42a05cde9ab9a58ecda4eb6d560d0dca6c44b7791bba195e2ab2a33e8c0dc1 SHA512 85f3af49c16dd2e545a3b91c076ac10107a4b9d0dc785cefe489e91eabdd82837f732685f1f0dca1695fc2f8095f42d5f30f145b659eb4295964787f06c1e37a
diff --git a/media-libs/cogl/cogl-1.22.2.ebuild b/media-libs/cogl/cogl-1.22.2.ebuild
deleted file mode 100644
index eae9521a25c..00000000000
--- a/media-libs/cogl/cogl-1.22.2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_EAUTORECONF="yes"
-inherit gnome2 multilib
-
-DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
-HOMEPAGE="https://www.cogl3d.org/"
-
-LICENSE="MIT BSD"
-SLOT="1.0/20" # subslot = .so version
-
-# doc and profile disable for now due to bugs #484750 and #483332
-IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland" # doc profile
-REQUIRED_USE="
- wayland? ( gles2 )
- || ( gles2 opengl )
-"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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/glib-utils
- >=dev-util/gtk-doc-am-1.13
- >=sys-devel/gettext-0.19
- virtual/pkgconfig
-"
-
-# Need classic mesa swrast for tests, llvmpipe causes a test failure
-# For some reason GL3 conformance test all fails again...
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-eglmesaext-include.patch
-)
-
-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 debug) \
- $(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) \
- --disable-unit-tests \
- $(use_enable wayland wayland-egl-platform) \
- $(use_enable wayland wayland-egl-server) \
- --disable-profile
-# $(use_enable profile)
-}
-
-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] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2020-03-13 12:31 Mart Raudsepp
0 siblings, 0 replies; 22+ messages in thread
From: Mart Raudsepp @ 2020-03-13 12:31 UTC (permalink / raw
To: gentoo-commits
commit: 09c6594b0bd27558734c9eaa7b997a35e3510aae
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 12:07:27 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 12:07:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09c6594b
media-libs/cogl: bump to 1.22.6
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
media-libs/cogl/Manifest | 1 +
media-libs/cogl/cogl-1.22.6.ebuild | 123 +++++++++++++++++++++++++++++++++++++
2 files changed, 124 insertions(+)
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 490e821584d..ca86cc21650 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1 +1,2 @@
DIST cogl-1.22.4.tar.xz 1723856 BLAKE2B 9e8532e3a0d17662042e2e61e45a7ddab6d3a35c7fbb070426b574292d7d3ed81e42a05cde9ab9a58ecda4eb6d560d0dca6c44b7791bba195e2ab2a33e8c0dc1 SHA512 85f3af49c16dd2e545a3b91c076ac10107a4b9d0dc785cefe489e91eabdd82837f732685f1f0dca1695fc2f8095f42d5f30f145b659eb4295964787f06c1e37a
+DIST cogl-1.22.6.tar.xz 1744240 BLAKE2B d3483c972705ec72d2ccbd06106bdd37ea23a7940c7d5f5d8c45da43a8e5ed7bc2fb5f07838b5a0cfe9b54d3681120008c03945ee8bac39042a9c263e84d3549 SHA512 b3475fa4fff3b6725f643b0d17d2de242fce1503cd83bd18031d98495501917bf5173152fb1aba7f2614fcf6553029fbb6f26bda5a497f5f12e2849ed301a483
diff --git a/media-libs/cogl/cogl-1.22.6.ebuild b/media-libs/cogl/cogl-1.22.6.ebuild
new file mode 100644
index 00000000000..8ab89e05321
--- /dev/null
+++ b/media-libs/cogl/cogl-1.22.6.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME2_EAUTORECONF="yes"
+inherit gnome2 multilib
+
+DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
+HOMEPAGE="https://www.cogl3d.org/"
+
+LICENSE="MIT BSD"
+SLOT="1.0/20" # subslot = .so version
+
+# doc and profile disable for now due to bugs #484750 and #483332
+IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland" # doc profile
+REQUIRED_USE="
+ wayland? ( gles2 )
+ || ( gles2 opengl )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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[egl,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/glib-utils
+ >=dev-util/gtk-doc-am-1.13
+ >=sys-devel/gettext-0.19
+ virtual/pkgconfig
+"
+
+# Need classic mesa swrast for tests, llvmpipe causes a test failure
+# For some reason GL3 conformance test all fails again...
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-eglmesaext-include.patch
+)
+
+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 debug) \
+ $(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) \
+ --disable-unit-tests \
+ $(use_enable wayland wayland-egl-platform) \
+ $(use_enable wayland wayland-egl-server) \
+ --disable-profile
+# $(use_enable profile)
+}
+
+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] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2020-04-20 20:42 Mart Raudsepp
0 siblings, 0 replies; 22+ messages in thread
From: Mart Raudsepp @ 2020-04-20 20:42 UTC (permalink / raw
To: gentoo-commits
commit: 5f98aac76a1a6c916dbd873ec44b2f310bd077cc
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 20 20:39:22 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Apr 20 20:42:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f98aac7
media-libs/cogl: remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
media-libs/cogl/Manifest | 1 -
media-libs/cogl/cogl-1.22.4.ebuild | 123 -------------------------------------
2 files changed, 124 deletions(-)
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index ca86cc21650..fb3c9f7a416 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,2 +1 @@
-DIST cogl-1.22.4.tar.xz 1723856 BLAKE2B 9e8532e3a0d17662042e2e61e45a7ddab6d3a35c7fbb070426b574292d7d3ed81e42a05cde9ab9a58ecda4eb6d560d0dca6c44b7791bba195e2ab2a33e8c0dc1 SHA512 85f3af49c16dd2e545a3b91c076ac10107a4b9d0dc785cefe489e91eabdd82837f732685f1f0dca1695fc2f8095f42d5f30f145b659eb4295964787f06c1e37a
DIST cogl-1.22.6.tar.xz 1744240 BLAKE2B d3483c972705ec72d2ccbd06106bdd37ea23a7940c7d5f5d8c45da43a8e5ed7bc2fb5f07838b5a0cfe9b54d3681120008c03945ee8bac39042a9c263e84d3549 SHA512 b3475fa4fff3b6725f643b0d17d2de242fce1503cd83bd18031d98495501917bf5173152fb1aba7f2614fcf6553029fbb6f26bda5a497f5f12e2849ed301a483
diff --git a/media-libs/cogl/cogl-1.22.4.ebuild b/media-libs/cogl/cogl-1.22.4.ebuild
deleted file mode 100644
index 05c33436405..00000000000
--- a/media-libs/cogl/cogl-1.22.4.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_EAUTORECONF="yes"
-inherit gnome2 multilib
-
-DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
-HOMEPAGE="https://www.cogl3d.org/"
-
-LICENSE="MIT BSD"
-SLOT="1.0/20" # subslot = .so version
-
-# doc and profile disable for now due to bugs #484750 and #483332
-IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland" # doc profile
-REQUIRED_USE="
- wayland? ( gles2 )
- || ( gles2 opengl )
-"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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[egl,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/glib-utils
- >=dev-util/gtk-doc-am-1.13
- >=sys-devel/gettext-0.19
- virtual/pkgconfig
-"
-
-# Need classic mesa swrast for tests, llvmpipe causes a test failure
-# For some reason GL3 conformance test all fails again...
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-eglmesaext-include.patch
-)
-
-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 debug) \
- $(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) \
- --disable-unit-tests \
- $(use_enable wayland wayland-egl-platform) \
- $(use_enable wayland wayland-egl-server) \
- --disable-profile
-# $(use_enable profile)
-}
-
-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] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2020-08-22 20:58 Mart Raudsepp
0 siblings, 0 replies; 22+ messages in thread
From: Mart Raudsepp @ 2020-08-22 20:58 UTC (permalink / raw
To: gentoo-commits
commit: f5ddd3f21315dec8f0a0bf32af26867d074d7639
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 14:31:42 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 20:57:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5ddd3f2
media-libs/cogl: bump to 1.22.8
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
media-libs/cogl/Manifest | 1 +
media-libs/cogl/cogl-1.22.8.ebuild | 117 +++++++++++++++++++++++++++++++++++++
2 files changed, 118 insertions(+)
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index fb3c9f7a416..329c6a7a693 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1 +1,2 @@
DIST cogl-1.22.6.tar.xz 1744240 BLAKE2B d3483c972705ec72d2ccbd06106bdd37ea23a7940c7d5f5d8c45da43a8e5ed7bc2fb5f07838b5a0cfe9b54d3681120008c03945ee8bac39042a9c263e84d3549 SHA512 b3475fa4fff3b6725f643b0d17d2de242fce1503cd83bd18031d98495501917bf5173152fb1aba7f2614fcf6553029fbb6f26bda5a497f5f12e2849ed301a483
+DIST cogl-1.22.8.tar.xz 1742632 BLAKE2B c6230a2223928c5d4e5d87fa6b039c96000fac546e3e57e04e528b571500d350013a4b6e0a2ab6b2133672fec992fff6f9486ab8c83a01cf9790bc94266c75d4 SHA512 702d5b1b22dc34bffaa82c9c57021caf036ee3a13fa7ca24a90cca1ebc0f8b7a86070cc1fe5125757132b02774fa874bb55675c96d1ccbc233fac0e6132da65f
diff --git a/media-libs/cogl/cogl-1.22.8.ebuild b/media-libs/cogl/cogl-1.22.8.ebuild
new file mode 100644
index 00000000000..0582d681b12
--- /dev/null
+++ b/media-libs/cogl/cogl-1.22.8.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2 multilib
+
+DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
+HOMEPAGE="https://www.cogl3d.org/"
+
+LICENSE="MIT BSD"
+SLOT="1.0/20" # subslot = .so version
+
+# doc and profile disable for now due to bugs #484750 and #483332
+IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland" # doc profile
+REQUIRED_USE="
+ wayland? ( gles2 )
+ || ( gles2 opengl )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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[egl,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/glib-utils
+ >=sys-devel/gettext-0.19
+ virtual/pkgconfig
+"
+
+# 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 debug) \
+ $(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) \
+ --disable-unit-tests \
+ $(use_enable wayland wayland-egl-platform) \
+ $(use_enable wayland wayland-egl-server) \
+ --disable-profile
+# $(use_enable profile)
+}
+
+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] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2020-08-30 15:17 Thomas Deutschmann
0 siblings, 0 replies; 22+ messages in thread
From: Thomas Deutschmann @ 2020-08-30 15:17 UTC (permalink / raw
To: gentoo-commits
commit: 0b6d14c9dab6b836d586eff1507c0291ffe0d659
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 14:54:55 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 15:17:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b6d14c9
media-libs/cogl: x86 stable (bug #738728)
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-libs/cogl/cogl-1.22.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/cogl/cogl-1.22.8.ebuild b/media-libs/cogl/cogl-1.22.8.ebuild
index 0582d681b12..3ff7a6a3f20 100644
--- a/media-libs/cogl/cogl-1.22.8.ebuild
+++ b/media-libs/cogl/cogl-1.22.8.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
wayland? ( gles2 )
|| ( gles2 opengl )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2021-03-04 0:23 Sam James
0 siblings, 0 replies; 22+ messages in thread
From: Sam James @ 2021-03-04 0:23 UTC (permalink / raw
To: gentoo-commits
commit: b7dd61e012e93e994466cbfd02cbeecd3fea6af5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 4 00:23:20 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 4 00:23:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7dd61e0
media-libs/cogl: Stabilize 1.22.8 arm64, #773172
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/cogl/cogl-1.22.8.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/cogl/cogl-1.22.8.ebuild b/media-libs/cogl/cogl-1.22.8.ebuild
index e8058579b8f..9396a6fa5d4 100644
--- a/media-libs/cogl/cogl-1.22.8.ebuild
+++ b/media-libs/cogl/cogl-1.22.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@ REQUIRED_USE="
wayland? ( gles2 )
|| ( gles2 opengl )
"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2021-09-11 8:53 Marek Szuba
0 siblings, 0 replies; 22+ messages in thread
From: Marek Szuba @ 2021-09-11 8:53 UTC (permalink / raw
To: gentoo-commits
commit: 68e21bd618ff50a0dd9a70a744042296390d2197
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 11 00:06:47 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Sep 11 08:53:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e21bd6
media-libs/cogl: keyword 1.22.8 for ~riscv
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
media-libs/cogl/cogl-1.22.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/cogl/cogl-1.22.8.ebuild b/media-libs/cogl/cogl-1.22.8.ebuild
index c2fb848a363..75c0d96cf93 100644
--- a/media-libs/cogl/cogl-1.22.8.ebuild
+++ b/media-libs/cogl/cogl-1.22.8.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
wayland? ( gles2 )
|| ( gles2 opengl )
"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2021-10-31 0:19 Sam James
0 siblings, 0 replies; 22+ messages in thread
From: Sam James @ 2021-10-31 0:19 UTC (permalink / raw
To: gentoo-commits
commit: a53a900276847ae7176e3675627ee3422d6e99af
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 22 05:38:04 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 00:19:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a53a9002
media-libs/cogl: Set USE-defaults for mesa[egl,gbm]
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/cogl/{cogl-1.22.8.ebuild => cogl-1.22.8-r1.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/cogl/cogl-1.22.8.ebuild b/media-libs/cogl/cogl-1.22.8-r1.ebuild
similarity index 98%
rename from media-libs/cogl/cogl-1.22.8.ebuild
rename to media-libs/cogl/cogl-1.22.8-r1.ebuild
index 75c0d96cf93..037d055dd7d 100644
--- a/media-libs/cogl/cogl-1.22.8.ebuild
+++ b/media-libs/cogl/cogl-1.22.8-r1.ebuild
@@ -40,12 +40,12 @@ COMMON_DEPEND="
media-libs/gst-plugins-base:1.0 )
introspection? ( >=dev-libs/gobject-introspection-1.34.2:= )
kms? (
- media-libs/mesa[egl,gbm]
+ media-libs/mesa[egl(+),gbm(+)]
x11-libs/libdrm:= )
pango? ( >=x11-libs/pango-1.20.0[introspection?] )
wayland? (
>=dev-libs/wayland-1.1.90
- media-libs/mesa[egl,wayland] )
+ media-libs/mesa[egl(+),wayland] )
"
# before clutter-1.7, cogl was part of clutter
RDEPEND="${COMMON_DEPEND}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2022-06-23 20:12 David Seifert
0 siblings, 0 replies; 22+ messages in thread
From: David Seifert @ 2022-06-23 20:12 UTC (permalink / raw
To: gentoo-commits
commit: 19f87fab275883d611ec8e6cf8102e470f4b18d5
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 20:12:22 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 20:12:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19f87fab
media-libs/cogl: update EAPI 6 -> 8
Signed-off-by: David Seifert <soap <AT> gentoo.org>
...cogl-1.22.8-r1.ebuild => cogl-1.22.8-r2.ebuild} | 37 ++++++++++------------
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/media-libs/cogl/cogl-1.22.8-r1.ebuild b/media-libs/cogl/cogl-1.22.8-r2.ebuild
similarity index 88%
rename from media-libs/cogl/cogl-1.22.8-r1.ebuild
rename to media-libs/cogl/cogl-1.22.8-r2.ebuild
index a5e772c9b85e..89cfdd28232c 100644
--- a/media-libs/cogl/cogl-1.22.8-r1.ebuild
+++ b/media-libs/cogl/cogl-1.22.8-r2.ebuild
@@ -1,29 +1,31 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
# Temporarily needed for slibtool patch
# It's upstreamed so should be able to drop in future
# bug #778041
GNOME2_EAUTORECONF="yes"
-inherit gnome2 multilib
+inherit gnome2
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
HOMEPAGE="https://www.cogl3d.org/"
LICENSE="MIT BSD"
SLOT="1.0/20" # subslot = .so version
-
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
# doc and profile disable for now due to bugs #484750 and #483332
IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland" # doc profile
REQUIRED_USE="
wayland? ( gles2 )
|| ( gles2 opengl )
"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+# Need classic mesa swrast for tests, llvmpipe causes a test failure
+# For some reason GL3 conformance test all fails again...
+RESTRICT="test"
-COMMON_DEPEND="
+DEPEND="
>=dev-libs/glib-2.32:2
x11-libs/cairo:=
>=x11-libs/gdk-pixbuf-2:2
@@ -37,30 +39,26 @@ COMMON_DEPEND="
gles2? ( media-libs/mesa[gles2] )
gstreamer? (
media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0 )
+ media-libs/gst-plugins-base:1.0
+ )
introspection? ( >=dev-libs/gobject-introspection-1.34.2:= )
kms? (
media-libs/mesa[egl(+),gbm(+)]
- x11-libs/libdrm:= )
+ x11-libs/libdrm:=
+ )
pango? ( >=x11-libs/pango-1.20.0[introspection?] )
wayland? (
>=dev-libs/wayland-1.1.90
- media-libs/mesa[egl(+),wayland] )
+ 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}
+RDEPEND="${DEPEND}"
+BDEPEND="
dev-util/glib-utils
>=sys-devel/gettext-0.19
virtual/pkgconfig
"
-# Need classic mesa swrast for tests, llvmpipe causes a test failure
-# For some reason GL3 conformance test all fails again...
-RESTRICT="test"
-
PATCHES=(
"${FILESDIR}"/${P}-slibtool.patch
)
@@ -100,7 +98,7 @@ src_configure() {
$(use_enable gles2) \
$(use_enable gles2 cogl-gles2) \
$(use_enable gles2 xlib-egl-platform) \
- $(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
+ $(usev gles2 --with-default-driver=$(usex opengl gl gles2)) \
$(use_enable gstreamer cogl-gst) \
$(use_enable introspection) \
$(use_enable kms kms-egl-platform) \
@@ -109,7 +107,6 @@ src_configure() {
$(use_enable wayland wayland-egl-platform) \
$(use_enable wayland wayland-egl-server) \
--disable-profile
-# $(use_enable profile)
}
src_install() {
@@ -122,5 +119,5 @@ src_install() {
gnome2_src_install
# Remove silly examples-data directory
- rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
+ rm -rvf "${ED}"/usr/share/cogl/examples-data/ || die
}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2022-10-31 2:56 Matt Turner
0 siblings, 0 replies; 22+ messages in thread
From: Matt Turner @ 2022-10-31 2:56 UTC (permalink / raw
To: gentoo-commits
commit: 7899129472751a21459dd261783e4f23df74186a
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 21:20:20 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 02:55:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78991294
media-libs/cogl: Set remote-id
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/cogl/metadata.xml | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/media-libs/cogl/metadata.xml b/media-libs/cogl/metadata.xml
index 2bdd552eba09..9b65a27f8c1d 100644
--- a/media-libs/cogl/metadata.xml
+++ b/media-libs/cogl/metadata.xml
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<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>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <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>
+ <upstream>
+ <remote-id type="gnome-gitlab">Archive/cogl</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2023-01-13 19:03 Arthur Zamarin
0 siblings, 0 replies; 22+ messages in thread
From: Arthur Zamarin @ 2023-01-13 19:03 UTC (permalink / raw
To: gentoo-commits
commit: 9f762ab55d070b470faa17b3faed6e5abc31b361
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 19:03:38 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 19:03:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f762ab5
media-libs/cogl: Stabilize 1.22.8-r2 ppc64, #874000
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-libs/cogl/cogl-1.22.8-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/cogl/cogl-1.22.8-r2.ebuild b/media-libs/cogl/cogl-1.22.8-r2.ebuild
index 89cfdd28232c..6525ed887742 100644
--- a/media-libs/cogl/cogl-1.22.8-r2.ebuild
+++ b/media-libs/cogl/cogl-1.22.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.cogl3d.org/"
LICENSE="MIT BSD"
SLOT="1.0/20" # subslot = .so version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86"
# doc and profile disable for now due to bugs #484750 and #483332
IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland" # doc profile
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2023-08-02 16:18 Sam James
0 siblings, 0 replies; 22+ messages in thread
From: Sam James @ 2023-08-02 16:18 UTC (permalink / raw
To: gentoo-commits
commit: 44daf65651b232196dab5bdd619a847c6cd8c900
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 2 16:18:24 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 2 16:18:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44daf656
media-libs/cogl: Stabilize 1.22.8-r2 ppc, #874000
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/cogl/cogl-1.22.8-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/cogl/cogl-1.22.8-r2.ebuild b/media-libs/cogl/cogl-1.22.8-r2.ebuild
index 6849942bc458..0c83744bddad 100644
--- a/media-libs/cogl/cogl-1.22.8-r2.ebuild
+++ b/media-libs/cogl/cogl-1.22.8-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.cogl3d.org/"
LICENSE="MIT BSD"
SLOT="1.0/20" # subslot = .so version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
# doc and profile disable for now due to bugs #484750 and #483332
IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland" # doc profile
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
@ 2024-05-23 16:10 Matt Turner
0 siblings, 0 replies; 22+ messages in thread
From: Matt Turner @ 2024-05-23 16:10 UTC (permalink / raw
To: gentoo-commits
commit: 5e211e1365aa59ecea277694f526454ebb1baee2
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu May 23 15:50:48 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu May 23 16:09:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e211e13
media-libs/cogl: Depend on libglvnd, not mesa
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/cogl/{cogl-1.22.8-r2.ebuild => cogl-1.22.8-r3.ebuild} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-libs/cogl/cogl-1.22.8-r2.ebuild b/media-libs/cogl/cogl-1.22.8-r3.ebuild
similarity index 96%
rename from media-libs/cogl/cogl-1.22.8-r2.ebuild
rename to media-libs/cogl/cogl-1.22.8-r3.ebuild
index 0c83744bddad..2e14d455e659 100644
--- a/media-libs/cogl/cogl-1.22.8-r2.ebuild
+++ b/media-libs/cogl/cogl-1.22.8-r3.ebuild
@@ -36,20 +36,20 @@ DEPEND="
>=x11-libs/libXfixes-3
>=x11-libs/libXrandr-1.2
virtual/opengl
- gles2? ( media-libs/mesa[gles2] )
+ gles2? ( media-libs/libglvnd )
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[egl(+),gbm(+)]
+ 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]
+ media-libs/mesa[wayland]
)
"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 22+ messages in thread
end of thread, other threads:[~2024-05-23 16:10 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-13 19:03 [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2024-05-23 16:10 Matt Turner
2023-08-02 16:18 Sam James
2022-10-31 2:56 Matt Turner
2022-06-23 20:12 David Seifert
2021-10-31 0:19 Sam James
2021-09-11 8:53 Marek Szuba
2021-03-04 0:23 Sam James
2020-08-30 15:17 Thomas Deutschmann
2020-08-22 20:58 Mart Raudsepp
2020-04-20 20:42 Mart Raudsepp
2020-03-13 12:31 Mart Raudsepp
2019-12-23 22:23 Mart Raudsepp
2019-11-23 19:45 Matt Turner
2019-11-17 17:51 Mart Raudsepp
2019-11-17 17:51 Mart Raudsepp
2019-04-25 18:14 Pacho Ramos
2018-10-06 22:37 Mart Raudsepp
2017-08-26 10:07 Gilles Dartiguelongue
2017-08-26 10:07 Gilles Dartiguelongue
2017-07-01 15:24 Alexis Ballier
2016-01-31 18:26 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox