Add upstream patch to fix totem crashes with nvidia-drivers (bug #549036, thanks to Harris Landgarten and Pacho Ramos).

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)

3 files changed, 95 insertions, 1 deletions

diff --git a/media-libs/clutter-gtk/ChangeLog b/media-libs/clutter-gtk/ChangeLog
index d8ced3682457..af5acc6ef402 100644
--- a/media-libs/clutter-gtk/ChangeLog
+++ b/media-libs/clutter-gtk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/clutter-gtk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/ChangeLog,v 1.60 2015/02/07 12:24:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/ChangeLog,v 1.61 2015/06/11 00:35:05 tetromino Exp $
+
+*clutter-gtk-1.6.0-r1 (11 Jun 2015)
+
+  11 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +clutter-gtk-1.6.0-r1.ebuild,
+  +files/clutter-gtk-1.6.0-clutter_gdk_get_visual.patch:
+  Add upstream patch to fix totem crashes with nvidia-drivers (bug #549036,
+  thanks to Harris Landgarten and Pacho Ramos).
 
   07 Feb 2015; Pacho Ramos <pacho@gentoo.org> -clutter-gtk-1.5.2.ebuild:
   Drop old
diff --git a/media-libs/clutter-gtk/clutter-gtk-1.6.0-r1.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..dbb48a48645b
--- /dev/null
+++ b/media-libs/clutter-gtk/clutter-gtk-1.6.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-1.6.0-r1.ebuild,v 1.1 2015/06/11 00:35:05 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="Library for embedding a Clutter canvas (stage) in GTK+"
+HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
+LICENSE="LGPL-2.1+"
+
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples +introspection"
+
+RDEPEND="
+	>=x11-libs/gtk+-3.6.0:3[introspection?]
+	>=media-libs/clutter-1.22.2-r1:1.0[introspection?]
+	media-libs/cogl:1.0=[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# patches from upstream git master
+	epatch "${FILESDIR}"/${P}-clutter_gdk_get_visual.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-maintainer-flags \
+		--enable-deprecated \
+		$(use_enable introspection)
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/{*.c,redhand.png}
+	fi
+}
diff --git a/media-libs/clutter-gtk/files/clutter-gtk-1.6.0-clutter_gdk_get_visual.patch b/media-libs/clutter-gtk/files/clutter-gtk-1.6.0-clutter_gdk_get_visual.patch
new file mode 100644
index 000000000000..921eb032e5d0
--- /dev/null
+++ b/media-libs/clutter-gtk/files/clutter-gtk-1.6.0-clutter_gdk_get_visual.patch
@@ -0,0 +1,34 @@
+From 60df86a6fbc0f5893fff182b4308c2ee4d679569 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Wed, 10 Jun 2015 12:03:54 +0100
+Subject: [PATCH] embed: Use the GDK visual from Clutter
+
+Instead of relying on the widget one. This is similar to what we do when
+running with the X11 backend.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=747489
+---
+ clutter-gtk/gtk-clutter-embed.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/clutter-gtk/gtk-clutter-embed.c b/clutter-gtk/gtk-clutter-embed.c
+index 64cc8b6..80b5839 100644
+--- a/clutter-gtk/gtk-clutter-embed.c
++++ b/clutter-gtk/gtk-clutter-embed.c
+@@ -327,6 +327,13 @@ gtk_clutter_embed_realize (GtkWidget *widget)
+   gint attributes_mask;
+   gint border_width;
+ 
++#if defined(CLUTTER_WINDOWING_GDK)
++  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_GDK))
++    {
++      GdkVisual *visual = clutter_gdk_get_visual ();
++      gtk_widget_set_visual (widget, visual);
++    }
++#endif
+ #if defined(GDK_WINDOWING_X11) && defined(CLUTTER_WINDOWING_X11)
+   if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
+     {
+-- 
+2.4.3
+