public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Pacho Ramos" <pacho@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/
Date: Sun, 31 Jan 2016 18:26:00 +0000 (UTC)	[thread overview]
Message-ID: <1454264559.45604bc017aa87a95bf1a761c388cf01d47ccc7a.pacho@gentoo> (raw)

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


             reply	other threads:[~2016-01-31 18:26 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-31 18:26 Pacho Ramos [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-07-01 15:24 [gentoo-commits] repo/gentoo:master commit in: media-libs/cogl/ Alexis Ballier
2017-08-26 10:07 Gilles Dartiguelongue
2017-08-26 10:07 Gilles Dartiguelongue
2018-10-06 22:37 Mart Raudsepp
2019-04-25 18:14 Pacho Ramos
2019-11-17 17:51 Mart Raudsepp
2019-11-17 17:51 Mart Raudsepp
2019-11-23 19:45 Matt Turner
2019-12-23 22:23 Mart Raudsepp
2020-03-13 12:31 Mart Raudsepp
2020-04-20 20:42 Mart Raudsepp
2020-08-22 20:58 Mart Raudsepp
2020-08-30 15:17 Thomas Deutschmann
2021-03-04  0:23 Sam James
2021-09-11  8:53 Marek Szuba
2021-10-31  0:19 Sam James
2022-06-23 20:12 David Seifert
2022-10-31  2:56 Matt Turner
2023-01-13 19:03 Arthur Zamarin
2023-08-02 16:18 Sam James
2024-05-23 16:10 Matt Turner
2024-11-19 12:06 Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1454264559.45604bc017aa87a95bf1a761c388cf01d47ccc7a.pacho@gentoo \
    --to=pacho@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox