[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: 5e211e1365aa59ecea277694f526454ebb1baee2
Author: Matt Turner gentoo org>
AuthorDate: Thu May 23 15:50:48 2024 +
Commit: Matt Turner gentoo org>
CommitDate: Thu May 23 16:09:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e211e13
media-libs/cogl: Depend on libglvnd, not mesa
Signed-off-by: Matt Turner 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}"
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: 44daf65651b232196dab5bdd619a847c6cd8c900 Author: Sam James gentoo org> AuthorDate: Wed Aug 2 16:18:24 2023 + Commit: Sam James gentoo org> CommitDate: Wed Aug 2 16:18:24 2023 + 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 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="
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: 9f762ab55d070b470faa17b3faed6e5abc31b361 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Jan 13 19:03:38 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Jan 13 19:03:38 2023 + 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 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="
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: 7899129472751a21459dd261783e4f23df74186a Author: Matt Turner gentoo org> AuthorDate: Sat Oct 29 21:20:20 2022 + Commit: Matt Turner gentoo org> CommitDate: Mon Oct 31 02:55:32 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78991294 media-libs/cogl: Set remote-id Signed-off-by: Matt Turner 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 @@ https://www.gentoo.org/dtd/metadata.dtd";> - - gn...@gentoo.org - Gentoo GNOME Desktop - - - Enable OpenGL ES 2.0 support - Enable KMS support. - Build cogl-pango library for x11-libs/pango integration - + +gn...@gentoo.org +Gentoo GNOME Desktop + + +Enable OpenGL ES 2.0 support +Enable KMS support. +Build cogl-pango library for x11-libs/pango integration + + +Archive/cogl +
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: 19f87fab275883d611ec8e6cf8102e470f4b18d5
Author: David Seifert gentoo org>
AuthorDate: Thu Jun 23 20:12:22 2022 +
Commit: David Seifert gentoo org>
CommitDate: Thu Jun 23 20:12:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19f87fab
media-libs/cogl: update EAPI 6 -> 8
Signed-off-by: David Seifert 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}
- !
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: a53a900276847ae7176e3675627ee3422d6e99af
Author: Matt Turner gentoo org>
AuthorDate: Thu Jul 22 05:38:04 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 31 00:19:15 2021 +
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 gentoo.org>
Signed-off-by: Sam James 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}
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: 68e21bd618ff50a0dd9a70a744042296390d2197 Author: Marek Szuba gentoo org> AuthorDate: Sat Sep 11 00:06:47 2021 + Commit: Marek Szuba gentoo org> CommitDate: Sat Sep 11 08:53:27 2021 + 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 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
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/, media-libs/cogl/files/
commit: 0098ec8fad775917aeaeddc0fa4d2f7f2ad992e7
Author: Sam James gentoo org>
AuthorDate: Sat Mar 27 01:37:14 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Mar 27 02:57:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0098ec8f
media-libs/cogl: fix build with slibtool
(Closing the NEEDED bug too which I filed
in the past as I can't reproduce right now.
Possibly fixed by this.)
Thanks-to: orbea riseup.net>
Closes: https://bugs.gentoo.org/778041
Closes: https://bugs.gentoo.org/739644
Signed-off-by: Sam James gentoo.org>
media-libs/cogl/cogl-1.22.8.ebuild | 8
media-libs/cogl/files/cogl-1.22.8-slibtool.patch | 26
2 files changed, 34 insertions(+)
diff --git a/media-libs/cogl/cogl-1.22.8.ebuild
b/media-libs/cogl/cogl-1.22.8.ebuild
index 9396a6fa5d4..c2fb848a363 100644
--- a/media-libs/cogl/cogl-1.22.8.ebuild
+++ b/media-libs/cogl/cogl-1.22.8.ebuild
@@ -3,6 +3,10 @@
EAPI=6
+# Temporarily needed for slibtool patch
+# It's upstreamed so should be able to drop in future
+# bug #778041
+GNOME2_EAUTORECONF="yes"
inherit gnome2 multilib
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
@@ -57,6 +61,10 @@ DEPEND="${COMMON_DEPEND}
# For some reason GL3 conformance test all fails again...
RESTRICT="test"
+PATCHES=(
+ "${FILESDIR}"/${P}-slibtool.patch
+)
+
src_prepare() {
# Do not build examples
sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
diff --git a/media-libs/cogl/files/cogl-1.22.8-slibtool.patch
b/media-libs/cogl/files/cogl-1.22.8-slibtool.patch
new file mode 100644
index 000..631ba13c563
--- /dev/null
+++ b/media-libs/cogl/files/cogl-1.22.8-slibtool.patch
@@ -0,0 +1,26 @@
+https://gitlab.gnome.org/GNOME/cogl/-/merge_requests/35
+https://bugs.gentoo.org/778041
+
+From 2bd3cbed45d633fb15625d58e6b7cb8721b0ba98 Mon Sep 17 00:00:00 2001
+From: orbea
+Date: Thu, 25 Mar 2021 07:17:20 -0700
+Subject: [PATCH] cogl-gles2: Fix undefined references.
+
+---
+ cogl-gles2/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cogl-gles2/Makefile.am b/cogl-gles2/Makefile.am
+index 72ec1eae..1328444e 100644
+--- a/cogl-gles2/Makefile.am
b/cogl-gles2/Makefile.am
+@@ -17,6 +17,7 @@ endif
+ AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
+
+ libcogl_gles2_la_SOURCES = cogl-gles2-api.c
++libcogl_gles2_la_LIBADD = $(top_builddir)/cogl/libcogl.la
+ libcogl_gles2_la_LDFLAGS = \
+ -no-undefined \
+ -version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ \
+--
+GitLab
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: b7dd61e012e93e994466cbfd02cbeecd3fea6af5 Author: Sam James gentoo org> AuthorDate: Thu Mar 4 00:23:20 2021 + Commit: Sam James gentoo org> CommitDate: Thu Mar 4 00:23:20 2021 + 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 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
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/files/, media-libs/cogl/
commit: aa0e79fed58d8ef58f7db2634bb993ad6d58ffd5
Author: Mart Raudsepp gentoo org>
AuthorDate: Sat Nov 7 14:50:56 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sat Nov 7 15:21:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa0e79fe
media-libs/cogl: remove old
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp gentoo.org>
media-libs/cogl/Manifest | 1 -
media-libs/cogl/cogl-1.22.6.ebuild | 123 -
.../cogl/files/cogl-eglmesaext-include.patch | 60 --
3 files changed, 184 deletions(-)
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 329c6a7a693..cd6497793d9 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,2 +1 @@
-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.6.ebuild
b/media-libs/cogl/cogl-1.22.6.ebuild
deleted file mode 100644
index 7f42f1ceab2..000
--- a/media-libs/cogl/cogl-1.22.6.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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}
- !
-Date: Tue, 29 Oct 2019 18:17:51 +0300
-Subject: [PATCH] Fix building against libglvnd-provided EGL headers
-
-Add missing EGL/eglmesaext.h include. When building against mesa-provided
-headers, this header is included indirectly via EGL/eglext.h.
-
-Also fix typo COGL_EGL_INCLUDE -> COGL_EGL_INCLUDES
- configure.ac | 16 ++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index da188edd..b0b0c94d 100644
a/configure.ac
-+++ b/configure.ac
-@@ -670,10 +670,15 @@ AS_IF([test "x$enable_gles1" = "xyes"],
- AC_SUBST([COGL_EGL_INCLUDES])
-
- AC_CHECK_HEADERS([EGL/eglext.h],
-- [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE
-+ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
- #include "],
- [],
- [$COGL_EGL_INCLUDES])
-+AC_CHECK_HEADERS([EGL/eglmesaext.h],
-+ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
-+#include "],
-+ [],
-+ [$COGL_EGL_INCLUDES])
-
- # Check for a GLES 1.x Common Profile library with/without EGL.
- #
-@@ -1178,6 +1183,12 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test
"x$EGL_CHECKED" != "xyes"],
- [],
- [AC_MSG_ERROR([Unable to locate required EGL headers])],
- [#include ])
-+AC_CHECK_HEADERS(
-+ [EGL/eglmesaext.h],
-+ [],
-+ [AC_MSG_ERROR([Unable to locate required EGL headers])],
-+ [#include
-+#include ])
-
- AC_CHECK_LIB(EGL, [eglInitialize],
- [COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"],
-@@ -1188,7 +119
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: 0b6d14c9dab6b836d586eff1507c0291ffe0d659 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Aug 30 14:54:55 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Aug 30 15:17:06 2020 + 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 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
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: f5ddd3f21315dec8f0a0bf32af26867d074d7639
Author: Mart Raudsepp gentoo org>
AuthorDate: Sat Aug 22 14:31:42 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sat Aug 22 20:57:27 2020 +
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 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 000..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}
+ !
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: 5f98aac76a1a6c916dbd873ec44b2f310bd077cc
Author: Mart Raudsepp gentoo org>
AuthorDate: Mon Apr 20 20:39:22 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Mon Apr 20 20:42:03 2020 +
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 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..000
--- 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}
- !
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: 09c6594b0bd27558734c9eaa7b997a35e3510aae
Author: Mart Raudsepp gentoo org>
AuthorDate: Fri Mar 13 12:07:27 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Fri Mar 13 12:07:27 2020 +
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 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 000..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}
+ !
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: 3e3e138a2371a6bdb57940ae2fc1817f37191423
Author: Mart Raudsepp gentoo org>
AuthorDate: Mon Dec 23 22:05:53 2019 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Mon Dec 23 22:22:57 2019 +
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 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..000
--- 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}
- !
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: 26cca8c1e7ac922579646c13fa8ad6f5c0081403
Author: Matt Turner gentoo org>
AuthorDate: Sat Nov 23 18:21:20 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Nov 23 19:44:00 2019 +
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 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
}
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/, media-libs/cogl/files/
commit: 95cabb346af451e99b89c1d2dc728551855cf6af
Author: Matt Turner gentoo org>
AuthorDate: Sat Nov 23 18:14:45 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Nov 23 19:44:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95cabb34
media-libs/cogl: Add patch to build with mesa-19.3
Closes: https://bugs.gentoo.org/692212
Signed-off-by: Matt Turner gentoo.org>
media-libs/cogl/cogl-1.22.2.ebuild | 5 ++
media-libs/cogl/cogl-1.22.4.ebuild | 5 ++
.../cogl/files/cogl-eglmesaext-include.patch | 60 ++
3 files changed, 70 insertions(+)
diff --git a/media-libs/cogl/cogl-1.22.2.ebuild
b/media-libs/cogl/cogl-1.22.2.ebuild
index c3702f70dec..eae9521a25c 100644
--- a/media-libs/cogl/cogl-1.22.2.ebuild
+++ b/media-libs/cogl/cogl-1.22.2.ebuild
@@ -3,6 +3,7 @@
EAPI=6
+GNOME2_EAUTORECONF="yes"
inherit gnome2 multilib
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
@@ -58,6 +59,10 @@ DEPEND="${COMMON_DEPEND}
# 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/" \
diff --git a/media-libs/cogl/cogl-1.22.4.ebuild
b/media-libs/cogl/cogl-1.22.4.ebuild
index 3265c8399cc..f79e884927e 100644
--- a/media-libs/cogl/cogl-1.22.4.ebuild
+++ b/media-libs/cogl/cogl-1.22.4.ebuild
@@ -3,6 +3,7 @@
EAPI=6
+GNOME2_EAUTORECONF="yes"
inherit gnome2 multilib
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
@@ -58,6 +59,10 @@ DEPEND="${COMMON_DEPEND}
# 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/" \
diff --git a/media-libs/cogl/files/cogl-eglmesaext-include.patch
b/media-libs/cogl/files/cogl-eglmesaext-include.patch
new file mode 100644
index 000..eff5c6841e1
--- /dev/null
+++ b/media-libs/cogl/files/cogl-eglmesaext-include.patch
@@ -0,0 +1,60 @@
+From 9c4764224aded552fb855b1c2b85b26d2b894adf Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy
+Date: Tue, 29 Oct 2019 18:17:51 +0300
+Subject: [PATCH] Fix building against libglvnd-provided EGL headers
+
+Add missing EGL/eglmesaext.h include. When building against mesa-provided
+headers, this header is included indirectly via EGL/eglext.h.
+
+Also fix typo COGL_EGL_INCLUDE -> COGL_EGL_INCLUDES
+---
+ configure.ac | 16 ++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index da188edd..b0b0c94d 100644
+--- a/configure.ac
b/configure.ac
+@@ -670,10 +670,15 @@ AS_IF([test "x$enable_gles1" = "xyes"],
+ AC_SUBST([COGL_EGL_INCLUDES])
+
+ AC_CHECK_HEADERS([EGL/eglext.h],
+- [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE
++ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
+ #include "],
+ [],
+ [$COGL_EGL_INCLUDES])
++AC_CHECK_HEADERS([EGL/eglmesaext.h],
++ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
++#include "],
++ [],
++ [$COGL_EGL_INCLUDES])
+
+ # Check for a GLES 1.x Common Profile library with/without EGL.
+ #
+@@ -1178,6 +1183,12 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test
"x$EGL_CHECKED" != "xyes"],
+ [],
+ [AC_MSG_ERROR([Unable to locate required EGL headers])],
+ [#include ])
++AC_CHECK_HEADERS(
++ [EGL/eglmesaext.h],
++ [],
++ [AC_MSG_ERROR([Unable to locate required EGL headers])],
++ [#include
++#include ])
+
+ AC_CHECK_LIB(EGL, [eglInitialize],
+ [COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"],
+@@ -1188,7 +1199,8 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test
"x$EGL_CHECKED" != "xyes"],
+ )
+
+ COGL_EGL_INCLUDES="#include
+-#include "
++#include
++#include "
+ AC_SUBST([COGL_EGL_INCLUDES])
+ ])
+
+--
+2.22.0
+
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: f87e81997e158c6fed35169a281f88b4385c509a
Author: Mart Raudsepp gentoo org>
AuthorDate: Sun Nov 17 17:45:59 2019 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sun Nov 17 17:51:21 2019 +
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 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}
>=de
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: fc115d74f4ef6895c0ae06c65ff1cd11b9981592
Author: Mart Raudsepp gentoo org>
AuthorDate: Sun Nov 17 17:50:53 2019 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sun Nov 17 17:51:21 2019 +
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 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
}
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: 932e728eca8ce21059fcc165911430a5deaa43e0
Author: Pacho Ramos gentoo org>
AuthorDate: Thu Apr 25 18:07:28 2019 +
Commit: Pacho Ramos gentoo org>
CommitDate: Thu Apr 25 18:14:51 2019 +
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 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 000..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}
+ !
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: f4aab3e9ed9c835d562232e130a4fc1588dd7406
Author: Mart Raudsepp gentoo org>
AuthorDate: Sat Oct 6 22:34:58 2018 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sat Oct 6 22:36:42 2018 +
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 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}
!
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/files/, media-libs/cogl/
commit: 54bdbb5491d762cd844b652569912230a7b8baaf
Author: Matt Turner gentoo org>
AuthorDate: Fri Nov 24 05:57:21 2017 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Nov 24 06:06:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54bdbb54
media-libs/cogl: Drop dead video_cards_fglrx
media-libs/cogl/cogl-1.22.2.ebuild| 6 +-
media-libs/cogl/files/cogl-1.22.0-fglrx.patch | 10 --
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/media-libs/cogl/cogl-1.22.2.ebuild
b/media-libs/cogl/cogl-1.22.2.ebuild
index 0419b0b7388..97738b3c596 100644
--- a/media-libs/cogl/cogl-1.22.2.ebuild
+++ b/media-libs/cogl/cogl-1.22.2.ebuild
@@ -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
video_cards_fglrx wayland" # doc profile
+IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango test
wayland" # doc profile
REQUIRED_USE="
wayland? ( gles2 )
|| ( gles2 opengl )
@@ -61,10 +61,6 @@ DEPEND="${COMMON_DEPEND}
RESTRICT="test"
src_prepare() {
- # Let cogl work with fglrx driver, bug #567168
- # https://bugzilla.gnome.org/show_bug.cgi?id=756306
- use video_cards_fglrx && eapply "${FILESDIR}"/${PN}-1.22.0-fglrx.patch
-
# Do not build examples
sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
-i Makefile.am Makefile.in || die
diff --git a/media-libs/cogl/files/cogl-1.22.0-fglrx.patch
b/media-libs/cogl/files/cogl-1.22.0-fglrx.patch
deleted file mode 100644
index dac1419a58b..000
--- a/media-libs/cogl/files/cogl-1.22.0-fglrx.patch
+++ /dev/null
@@ -1,10 +0,0 @@
a/cogl/driver/gl/gl/cogl-driver-gl.c 2015-09-02 18:39:02.0
+0200
-+++ b/cogl/driver/gl/gl/cogl-driver-gl.c 2015-10-18 10:37:14.052350142
+0200
-@@ -419,7 +419,7 @@
- if (COGL_CHECK_GL_VERSION (ctx->glsl_major, ctx->glsl_minor, 1, 2))
- /* We want to use version 120 if it is available so that the
- * gl_PointCoord can be used. */
--ctx->glsl_version_to_use = 120;
-+ctx->glsl_version_to_use = 150;
- else
- ctx->glsl_version_to_use = 110;
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/files/
commit: ad90825ec809b04a7fbd39080d4399544fe54afb
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sun Oct 1 13:34:05 2017 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Mon Oct 30 22:34:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad90825e
media-libs/cogl: remove unused patches
.../cogl/files/cogl-1.22.0-initial-output.patch| 46 --
media-libs/cogl/files/cogl-1.22.0-wait-flip.patch | 42
2 files changed, 88 deletions(-)
diff --git a/media-libs/cogl/files/cogl-1.22.0-initial-output.patch
b/media-libs/cogl/files/cogl-1.22.0-initial-output.patch
deleted file mode 100644
index d7f9d0ff99f..000
--- a/media-libs/cogl/files/cogl-1.22.0-initial-output.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 188752158701e3a406e7fd5850b3eaf9c4798cd7 Mon Sep 17 00:00:00 2001
-From: Ray Strode
-Date: Fri, 13 Nov 2015 13:35:05 -0500
-Subject: winsys-egl-kms: bypass initial output setup if kms fd passed in
-
-if mutter is handling the output setup, then we shouldn't do it,
-too.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=758073
- cogl/winsys/cogl-winsys-egl-kms.c | 12
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/cogl/winsys/cogl-winsys-egl-kms.c
b/cogl/winsys/cogl-winsys-egl-kms.c
-index b460907..6d7049d 100644
a/cogl/winsys/cogl-winsys-egl-kms.c
-+++ b/cogl/winsys/cogl-winsys-egl-kms.c
-@@ -663,6 +663,14 @@ _cogl_winsys_egl_display_setup (CoglDisplay *display,
- return FALSE;
- }
-
-+ /* Force a full modeset / drmModeSetCrtc on
-+ * the first swap buffers call.
-+ */
-+ kms_display->pending_set_crtc = TRUE;
-+
-+ if (kms_renderer->opened_fd < 0)
-+return TRUE;
-+
- output0 = find_output (0,
- kms_renderer->fd,
- resources,
-@@ -736,10 +744,6 @@ _cogl_winsys_egl_display_setup (CoglDisplay *display,
- kms_display->width = output0->mode.hdisplay;
- kms_display->height = output0->mode.vdisplay;
-
-- /* We defer setting the crtc modes until the first swap_buffers request of a
-- * CoglOnscreen framebuffer. */
-- kms_display->pending_set_crtc = TRUE;
--
- return TRUE;
- }
-
---
-cgit v0.11.2
-
diff --git a/media-libs/cogl/files/cogl-1.22.0-wait-flip.patch
b/media-libs/cogl/files/cogl-1.22.0-wait-flip.patch
deleted file mode 100644
index b7c4d99a281..000
--- a/media-libs/cogl/files/cogl-1.22.0-wait-flip.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From a583492ea2aa3ea8e78c269bd5db3f52f82aa79c Mon Sep 17 00:00:00 2001
-From: Ray Strode
-Date: Wed, 21 Oct 2015 15:47:01 -0400
-Subject: kms-winsys: don't wait for a flip when page flipping fails
-
-If we get EACCES from drmPageFlip we're not going to get
-a flip event and shouldn't wait for one.
-
-This commit changes the EACCES path to silently ignore the
-failed flip request and just clean up the fb.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=756926
- cogl/winsys/cogl-winsys-egl-kms.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/cogl/winsys/cogl-winsys-egl-kms.c
b/cogl/winsys/cogl-winsys-egl-kms.c
-index 20c325c..b460907 100644
a/cogl/winsys/cogl-winsys-egl-kms.c
-+++ b/cogl/winsys/cogl-winsys-egl-kms.c
-@@ -590,7 +590,7 @@ flip_all_crtcs (CoglDisplay *display, CoglFlipKMS *flip,
int fb_id)
- for (l = kms_display->crtcs; l; l = l->next)
- {
- CoglKmsCrtc *crtc = l->data;
-- int ret;
-+ int ret = 0;
-
- if (crtc->count == 0 || crtc->ignore)
- continue;
-@@ -610,7 +610,8 @@ flip_all_crtcs (CoglDisplay *display, CoglFlipKMS *flip,
int fb_id)
- }
- }
-
-- flip->pending++;
-+ if (ret == 0)
-+flip->pending++;
- }
-
- if (kms_renderer->page_flips_not_supported && needs_flip)
---
-cgit v0.11.2
-
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/files/
commit: b174ffeaa087fdcef1e9400d3f0752d86b07a98c
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sun Oct 1 13:34:05 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Oct 30 21:26:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b174ffea
media-libs/cogl: remove unused patches.
Closes: https://github.com/gentoo/gentoo/pull/5828
.../cogl/files/cogl-1.22.0-initial-output.patch| 46 --
media-libs/cogl/files/cogl-1.22.0-wait-flip.patch | 42
2 files changed, 88 deletions(-)
diff --git a/media-libs/cogl/files/cogl-1.22.0-initial-output.patch
b/media-libs/cogl/files/cogl-1.22.0-initial-output.patch
deleted file mode 100644
index d7f9d0ff99f..000
--- a/media-libs/cogl/files/cogl-1.22.0-initial-output.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 188752158701e3a406e7fd5850b3eaf9c4798cd7 Mon Sep 17 00:00:00 2001
-From: Ray Strode
-Date: Fri, 13 Nov 2015 13:35:05 -0500
-Subject: winsys-egl-kms: bypass initial output setup if kms fd passed in
-
-if mutter is handling the output setup, then we shouldn't do it,
-too.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=758073
- cogl/winsys/cogl-winsys-egl-kms.c | 12
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/cogl/winsys/cogl-winsys-egl-kms.c
b/cogl/winsys/cogl-winsys-egl-kms.c
-index b460907..6d7049d 100644
a/cogl/winsys/cogl-winsys-egl-kms.c
-+++ b/cogl/winsys/cogl-winsys-egl-kms.c
-@@ -663,6 +663,14 @@ _cogl_winsys_egl_display_setup (CoglDisplay *display,
- return FALSE;
- }
-
-+ /* Force a full modeset / drmModeSetCrtc on
-+ * the first swap buffers call.
-+ */
-+ kms_display->pending_set_crtc = TRUE;
-+
-+ if (kms_renderer->opened_fd < 0)
-+return TRUE;
-+
- output0 = find_output (0,
- kms_renderer->fd,
- resources,
-@@ -736,10 +744,6 @@ _cogl_winsys_egl_display_setup (CoglDisplay *display,
- kms_display->width = output0->mode.hdisplay;
- kms_display->height = output0->mode.vdisplay;
-
-- /* We defer setting the crtc modes until the first swap_buffers request of a
-- * CoglOnscreen framebuffer. */
-- kms_display->pending_set_crtc = TRUE;
--
- return TRUE;
- }
-
---
-cgit v0.11.2
-
diff --git a/media-libs/cogl/files/cogl-1.22.0-wait-flip.patch
b/media-libs/cogl/files/cogl-1.22.0-wait-flip.patch
deleted file mode 100644
index b7c4d99a281..000
--- a/media-libs/cogl/files/cogl-1.22.0-wait-flip.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From a583492ea2aa3ea8e78c269bd5db3f52f82aa79c Mon Sep 17 00:00:00 2001
-From: Ray Strode
-Date: Wed, 21 Oct 2015 15:47:01 -0400
-Subject: kms-winsys: don't wait for a flip when page flipping fails
-
-If we get EACCES from drmPageFlip we're not going to get
-a flip event and shouldn't wait for one.
-
-This commit changes the EACCES path to silently ignore the
-failed flip request and just clean up the fb.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=756926
- cogl/winsys/cogl-winsys-egl-kms.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/cogl/winsys/cogl-winsys-egl-kms.c
b/cogl/winsys/cogl-winsys-egl-kms.c
-index 20c325c..b460907 100644
a/cogl/winsys/cogl-winsys-egl-kms.c
-+++ b/cogl/winsys/cogl-winsys-egl-kms.c
-@@ -590,7 +590,7 @@ flip_all_crtcs (CoglDisplay *display, CoglFlipKMS *flip,
int fb_id)
- for (l = kms_display->crtcs; l; l = l->next)
- {
- CoglKmsCrtc *crtc = l->data;
-- int ret;
-+ int ret = 0;
-
- if (crtc->count == 0 || crtc->ignore)
- continue;
-@@ -610,7 +610,8 @@ flip_all_crtcs (CoglDisplay *display, CoglFlipKMS *flip,
int fb_id)
- }
- }
-
-- flip->pending++;
-+ if (ret == 0)
-+flip->pending++;
- }
-
- if (kms_renderer->page_flips_not_supported && needs_flip)
---
-cgit v0.11.2
-
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: e94a9a76d2e0933982cc643ed94a5153d2fe8e8c
Author: Gilles Dartiguelongue gentoo org>
AuthorDate: Sat Aug 26 08:24:11 2017 +
Commit: Gilles Dartiguelongue gentoo org>
CommitDate: Sat Aug 26 10:06:58 2017 +
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..000
--- 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}
- !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/w
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: 99153f0e17624c2f6731302b9d39b96dcebaabaf Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Aug 26 08:28:22 2017 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sat Aug 26 10:06:59 2017 + 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
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: 0141f64a41d91ecb0f1726d98c2f8f8d0dd9ef75 Author: Alexis Ballier gentoo org> AuthorDate: Sat Jul 1 14:19:30 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Sat Jul 1 15:24:40 2017 + 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
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/, media-libs/cogl/files/
commit: ed1459945ee449ca13353f6f58ffb90f4cbe8c05
Author: Gilles Dartiguelongue gentoo org>
AuthorDate: Wed Sep 7 07:22:28 2016 +
Commit: Gilles Dartiguelongue gentoo org>
CommitDate: Wed Sep 7 07:26:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed145994
media-libs/cogl: version bump from 1.22.0-r1 to 1.22.2
Package-Manager: portage-2.3.0
media-libs/cogl/Manifest | 1 +
media-libs/cogl/cogl-1.22.2.ebuild| 137 ++
media-libs/cogl/files/cogl-1.22.0-fglrx.patch | 4 +-
3 files changed, 140 insertions(+), 2 deletions(-)
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 00ddf7f..8c87210 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,2 +1,3 @@
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.22.2.ebuild
b/media-libs/cogl/cogl-1.22.2.ebuild
new file mode 100644
index ..aefbb71
--- /dev/null
+++ b/media-libs/cogl/cogl-1.22.2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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="debug 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}
+ !https://bugzilla.gnome.org/show_bug.cgi?id=756306
+ use video_cards_fglrx && eapply "${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-pixb
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
commit: 45604bc017aa87a95bf1a761c388cf01d47ccc7a
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Jan 31 18:22:39 2016 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Jan 31 18:22:39 2016 +
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 000..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}
+ !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
+
[gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/, media-libs/cogl/files/
commit: a56306e9127a0550c308b49f4ea58c6f4351724f
Author: Pacho Ramos gentoo org>
AuthorDate: Sat Jan 23 13:28:10 2016 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat Jan 23 13:28:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a56306e9
media-libs/cogl: Apply upstream fixes, also fix cogl not working at all with
fglrx drivers, we need to apply the fix conditionally until someone figures out
how to properly check for fglrx presence for the patch (#567168, upstream bug
#756306, thanks to Olcay for reporting and testing this).
Package-Manager: portage-2.2.26
media-libs/cogl/cogl-1.22.0-r1.ebuild | 144 +
media-libs/cogl/files/cogl-1.22.0-fglrx.patch | 10 ++
.../cogl/files/cogl-1.22.0-initial-output.patch| 46 +++
media-libs/cogl/files/cogl-1.22.0-wait-flip.patch | 42 ++
4 files changed, 242 insertions(+)
diff --git a/media-libs/cogl/cogl-1.22.0-r1.ebuild
b/media-libs/cogl/cogl-1.22.0-r1.ebuild
new file mode 100644
index 000..6252c25
--- /dev/null
+++ b/media-libs/cogl/cogl-1.22.0-r1.ebuild
@@ -0,0 +1,144 @@
+# 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}
+ !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
