From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RAW7N-0006n3-BY for garchives@archives.gentoo.org; Mon, 03 Oct 2011 00:10:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E462B21C025; Mon, 3 Oct 2011 00:10:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9F78C21C025 for ; Mon, 3 Oct 2011 00:10:41 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E27751B4009 for ; Mon, 3 Oct 2011 00:10:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3F1F480042 for ; Mon, 3 Oct 2011 00:10:40 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <874a04b7c16b4befe4e8fbeaee6624fa6e1cbb81.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: media-libs/clutter-gst/, media-libs/clutter-gst/files/ X-VCS-Repository: proj/gnome X-VCS-Files: media-libs/clutter-gst/clutter-gst-1.4.0.ebuild media-libs/clutter-gst/files/clutter-gst-1.4.0-null-free.patch X-VCS-Directories: media-libs/clutter-gst/ media-libs/clutter-gst/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 874a04b7c16b4befe4e8fbeaee6624fa6e1cbb81 Date: Mon, 3 Oct 2011 00:10:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 290de850827e14fe7a4d465d0a0913ad commit: 874a04b7c16b4befe4e8fbeaee6624fa6e1cbb81 Author: Alexandre Rostovtsev gmail com> AuthorDate: Mon Oct 3 00:05:34 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Mon Oct 3 00:09:38 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D874a04b7 media-libs/clutter-gst: add 1.4.0 Hack around the access violation bugs (#360219, #360073, #363917, and now #385433) by deliberately setting an invalid DISPLAY. Depend on cogl since configure checks for it and this is, after all, the gnome-3.2 overlay. --- media-libs/clutter-gst/clutter-gst-1.4.0.ebuild | 53 ++++++++++++++= ++++++ .../files/clutter-gst-1.4.0-null-free.patch | 24 +++++++++ 2 files changed, 77 insertions(+), 0 deletions(-) diff --git a/media-libs/clutter-gst/clutter-gst-1.4.0.ebuild b/media-libs= /clutter-gst/clutter-gst-1.4.0.ebuild new file mode 100644 index 0000000..7434688 --- /dev/null +++ b/media-libs/clutter-gst/clutter-gst-1.4.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.= 3.14.ebuild,v 1.1 2011/09/09 17:14:58 pacho Exp $ + +EAPI=3D"3" +PYTHON_DEPEND=3D"2" # Just a build-time dependency +GNOME_TARBALL_SUFFIX=3D"xz" +CLUTTER_LA_PUNT=3D"yes" + +# inherit clutter after gnome2 so that defaults aren't overriden +# inherit gnome.org in the end so we use gnome mirrors and get the xz ta= rball +inherit python gnome2 clutter gnome.org + +DESCRIPTION=3D"GStreamer Integration library for Clutter" + +SLOT=3D"1.0" +KEYWORDS=3D"~amd64 ~x86" +IUSE=3D"debug doc examples +introspection" + +# Automagic cogl-1.8 dependency, and cogl requires clutter-1.8 +RDEPEND=3D" + >=3Ddev-libs/glib-2.20:2 + >=3Dmedia-libs/clutter-1.8.0:1.0[introspection?] + >=3Dmedia-libs/cogl-1.8.0:1.0[introspection?] + >=3Dmedia-libs/gstreamer-0.10.26:0.10[introspection?] + media-libs/gst-plugins-base:0.10[introspection?] + introspection? ( >=3Ddev-libs/gobject-introspection-0.6.8 )" +DEPEND=3D"${RDEPEND} + sys-apps/sed + doc? ( >=3Ddev-util/gtk-doc-1.8 )" + +DOCS=3D"AUTHORS NEWS README" +EXAMPLES=3D"examples/{*.c,*.png,README}" + +src_prepare() { + # Patch from upstream to not free a NULL, will be in next release + epatch "${FILESDIR}/${P}-null-free.patch" + + # XXX: debug default is "minimum" in even releases; "yes" in odd releas= es + G2CONF=3D"${G2CONF} + $(use_enable introspection)" + + gnome2_src_prepare + python_convert_shebangs 2 "${S}"/scripts/pso2h.py +} + +src_compile() { + # Clutter tries to access dri without userpriv + # Massive failure of a hack, see bug 360219, bug 360073, bug 363917, bu= g 385433 + DISPLAY=3D"999invalid" + + gnome2_src_compile +} diff --git a/media-libs/clutter-gst/files/clutter-gst-1.4.0-null-free.pat= ch b/media-libs/clutter-gst/files/clutter-gst-1.4.0-null-free.patch new file mode 100644 index 0000000..b40f97a --- /dev/null +++ b/media-libs/clutter-gst/files/clutter-gst-1.4.0-null-free.patch @@ -0,0 +1,24 @@ +From 08e539ecef13de3fdefc83fb422babb9a2201ac3 Mon Sep 17 00:00:00 2001 +From: Damien Lespiau +Date: Fri, 30 Sep 2011 12:00:48 +0000 +Subject: player: Don't try to free NULL GstTagList + +When the info is not ready yet, tag lists are NULL. Don't try to free +NULL tag lists... +--- +diff --git a/clutter-gst/clutter-gst-player.c b/clutter-gst/clutter-gst-= player.c +index b60161c..9f4ecf5 100644 +--- a/clutter-gst/clutter-gst-player.c ++++ b/clutter-gst/clutter-gst-player.c +@@ -285,7 +285,8 @@ free_tags_list (GList **listp) + l =3D *listp; + while (l) + { +- gst_tag_list_free (l->data); ++ if (l->data) ++ gst_tag_list_free (l->data); + l =3D g_list_delete_link (l, l); + } +=20 +-- +cgit v0.9.0.2