From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-860769-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 4599A58975
	for <garchives@archives.gentoo.org>; Sun, 31 Jan 2016 18:26:06 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 2DB5921C01C;
	Sun, 31 Jan 2016 18:26:04 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id BA4CF21C01C
	for <gentoo-commits@lists.gentoo.org>; Sun, 31 Jan 2016 18:26:03 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 47DE233FDBF
	for <gentoo-commits@lists.gentoo.org>; Sun, 31 Jan 2016 18:26:02 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 3BCBC8F0
	for <gentoo-commits@lists.gentoo.org>; Sun, 31 Jan 2016 18:26:00 +0000 (UTC)
From: "Pacho Ramos" <pacho@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" <pacho@gentoo.org>
Message-ID: <1454264559.45604bc017aa87a95bf1a761c388cf01d47ccc7a.pacho@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/cogl/cogl-1.22.0-r2.ebuild
X-VCS-Directories: media-libs/cogl/
X-VCS-Committer: pacho
X-VCS-Committer-Name: Pacho Ramos
X-VCS-Revision: 45604bc017aa87a95bf1a761c388cf01d47ccc7a
X-VCS-Branch: master
Date: Sun, 31 Jan 2016 18:26:00 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 29d780d2-5f96-4534-a08a-957c2700e138
X-Archives-Hash: e59357e4d56a422a9e5e071a5aa11a42

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
+}