From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- media-libs/cogl/Manifest | 3 - media-libs/cogl/cogl-1.22.6.ebuild | 123 --------------------- .../cogl/files/cogl-eglmesaext-include.patch | 60 ---------- 3 files changed, 186 deletions(-) delete mode 100644 media-libs/cogl/cogl-1.22.6.ebuild delete mode 100644 media-libs/cogl/files/cogl-eglmesaext-include.patch (limited to 'media-libs/cogl') diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest index 0d662312275d..7bac5bf10270 100644 --- a/media-libs/cogl/Manifest +++ b/media-libs/cogl/Manifest @@ -1,6 +1,3 @@ -AUX cogl-eglmesaext-include.patch 2204 BLAKE2B 307a473a606129fe7e08e65915dbe985d3765c2745ec444b41592f8c36ab5b6ad0d43bbc35a93f01666d8cff81111e0c211bddfbf5d89f48591c8bf5377cb471 SHA512 41e475d73e12e4ab517c49ae1a70d1dd71e9f8a618eb28cd7b81430bf3acec84bbdf8a31ec4e02fd87734fe402e523cda5c14c4a4c5d63928b9de930bcf23e10 -DIST cogl-1.22.6.tar.xz 1744240 BLAKE2B d3483c972705ec72d2ccbd06106bdd37ea23a7940c7d5f5d8c45da43a8e5ed7bc2fb5f07838b5a0cfe9b54d3681120008c03945ee8bac39042a9c263e84d3549 SHA512 b3475fa4fff3b6725f643b0d17d2de242fce1503cd83bd18031d98495501917bf5173152fb1aba7f2614fcf6553029fbb6f26bda5a497f5f12e2849ed301a483 DIST cogl-1.22.8.tar.xz 1742632 BLAKE2B c6230a2223928c5d4e5d87fa6b039c96000fac546e3e57e04e528b571500d350013a4b6e0a2ab6b2133672fec992fff6f9486ab8c83a01cf9790bc94266c75d4 SHA512 702d5b1b22dc34bffaa82c9c57021caf036ee3a13fa7ca24a90cca1ebc0f8b7a86070cc1fe5125757132b02774fa874bb55675c96d1ccbc233fac0e6132da65f -EBUILD cogl-1.22.6.ebuild 3384 BLAKE2B c591d4942a45b55cd9bceb0dd8e438c15a2a4a8b6dc2e2ca1f56dde8e3f113c8d4b6543f5d34b065f2690dcda4553b4a32ea5a21a03ebca8e982a809f1f03920 SHA512 3aabd0e305a5391109755f90f022487aebcaf46482094d0f8894d3c94565ceb661b63ac0bc5e4b22d122d6f16d00df9009f86541970ee28e470349e64c4caaec EBUILD cogl-1.22.8.ebuild 3272 BLAKE2B f9663431b857b6719190e66eb8388f70b195107ca4ec90284e91b136e7f5c2c983ddb90c2ab4cf410ff51d5ef22bd3739a8cf716f75c383383e8906a1c8945f1 SHA512 b67a1bbd105f756518825e59b145330861fa962bef05eb8e7be9ea5f608aed7683872631465944bf508606f2014354e7196399e92e4cb2d8661212c75cefe3ee MISC metadata.xml 457 BLAKE2B 79c55fb3e5a1e5772c7b26cea5b54b15d683772204ec2ff2229481085130f4945b877a4608f01308a297571c01fa0da50220cd44b6a333eb34d2aae71c3a9157 SHA512 e0e4be51119ec98c906ca2f5df69c9024d77855fafa53ec00bc30b481f33dfd98708c2c9021737f84a46121788079fdc1d9ecffc2693a3257819f05879318a44 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 7f42f1ceab22..000000000000 --- 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 +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 - -- cgit v1.2.3