Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 549036 - [gnome-overlay] media-sound/girl-5.0.0 fails to play anything because of totem-3.14 failures
Summary: [gnome-overlay] media-sound/girl-5.0.0 fails to play anything because of tote...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] GNOME (show other bugs)
Hardware: All Linux
: Normal normal with 1 vote (vote)
Assignee: Gentoo Linux Gnome Desktop Team
URL: https://bugzilla.gnome.org/show_bug.c...
Whiteboard:
Keywords:
: 549132 550868 (view as bug list)
Depends on:
Blocks: gnome-3.16
  Show dependency tree
 
Reported: 2015-05-10 00:27 UTC by Harris Landgarten
Modified: 2015-06-11 00:35 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Harris Landgarten 2015-05-10 00:27:35 UTC
whenever listen is clicked on girl the following error shows in the log:

May 09 19:51:40 harrisl-desktop girl.desktop[25787]: (totem:27183): Gdk-ERROR **: The program 'totem' received an X Window System error.
May 09 19:51:40 harrisl-desktop girl.desktop[25787]: This probably reflects a bug in the program.
May 09 19:51:40 harrisl-desktop girl.desktop[25787]: The error was 'BadMatch (invalid parameter attributes)'.
May 09 19:51:40 harrisl-desktop girl.desktop[25787]: (Details: serial 401 error_code 8 request_code 153 (GLX) minor_code 31)
May 09 19:51:40 harrisl-desktop girl.desktop[25787]: (Note to programmers: normally, X errors are reported asynchronously;
May 09 19:51:40 harrisl-desktop girl.desktop[25787]: that is, you will receive the error a while after causing it.
May 09 19:51:40 harrisl-desktop girl.desktop[25787]: To debug your program, run it with the GDK_SYNCHRONIZE environment
May 09 19:51:40 harrisl-desktop girl.desktop[25787]: variable to change this behavior. You can then get a meaningful
May 09 19:51:40 harrisl-desktop girl.desktop[25787]: backtrace from your debugger if you break on the gdk_x_error() function.)
May 09 19:51:40 harrisl-desktop kernel: traps: totem[27183] trap int3 ip:7fef2c738c60 sp:7ffffad525b0 error:0
May 09 19:51:42 harrisl-desktop kernel: traps: totem[27204] trap int3 ip:7fb46e7a5c60 sp:7ffde925a210 error:0

totem-3.14 fails when started from command line with:

harrisl@harrisl-desktop ~ $ totem

(totem:15382): Gdk-ERROR **: The program 'totem' received an X Window System error.
This probably reflects a bug in the program.
The error was 'BadMatch (invalid parameter attributes)'.
  (Details: serial 401 error_code 8 request_code 153 (GLX) minor_code 31)
  (Note to programmers: normally, X errors are reported asynchronously;
   that is, you will receive the error a while after causing it.
   To debug your program, run it with the GDK_SYNCHRONIZE environment
   variable to change this behavior. You can then get a meaningful
   backtrace from your debugger if you break on the gdk_x_error() function.)
Trace/breakpoint trap

a similar BadMatch error occurs when running pivtivi and cheese-3.14. All these programs depend on clutter-gst.

totem-9999 needs clutter-gst-3.0 which is not in the overlay yet.
Comment 1 Gilles Dartiguelongue (RETIRED) gentoo-dev 2015-05-10 09:46:54 UTC
This rather look like a driver problem as I am running this on a Gnome 3.14 desktop. Do you happen to run with Nvidia hardware ? Please add emerge --info.
Comment 2 Harris Landgarten 2015-05-10 11:42:58 UTC
yes I am running with nvidia-drivers so that could be the issue

harrisl@harrisl-desktop ~ $ sudo emerge --info
Portage 2.2.18 (python 3.3.5-final-0, default/linux/amd64/13.0/desktop/gnome/systemd, gcc-4.9.2, glibc-2.20-r2, 4.0.2-gentoo x86_64)
=================================================================
System uname: Linux-4.0.2-gentoo-x86_64-Intel-R-_Core-TM-_i7_CPU_970_@_3.20GHz-with-gentoo-2.2
KiB Mem:    24680600 total,    205572 free
KiB Swap:   62914548 total,  62913960 free
sh bash 4.3_p33-r2
ld GNU ld (Gentoo 2.25 p1.0) 2.25
app-shells/bash:          4.3_p33-r2::<unknown repository>
dev-java/java-config:     2.2.0::<unknown repository>
dev-lang/perl:            5.20.2-r1::<unknown repository>
dev-lang/python:          2.7.9-r2::<unknown repository>, 3.2.5-r6::<unknown repository>, 3.3.5-r1::<unknown repository>, 3.4.3::<unknown repository>
dev-util/cmake:           3.2.2::<unknown repository>
dev-util/pkgconfig:       0.28-r2::<unknown repository>
sys-apps/baselayout:      2.2::<unknown repository>
sys-apps/openrc:          0.15.1::<unknown repository>
sys-apps/sandbox:         2.6-r1::<unknown repository>
sys-devel/autoconf:       2.13::<unknown repository>, 2.69-r1::<unknown repository>
sys-devel/automake:       1.10.3-r1::<unknown repository>, 1.11.6-r1::<unknown repository>, 1.12.6::<unknown repository>, 1.13.4::<unknown repository>, 1.14.1::<unknown repository>, 1.15::<unknown repository>
sys-devel/binutils:       2.25::<unknown repository>
sys-devel/gcc:            4.9.2::gentoo
sys-devel/gcc-config:     1.8::<unknown repository>
sys-devel/libtool:        2.4.6-r1::<unknown repository>
sys-devel/make:           4.1-r1::<unknown repository>
sys-kernel/linux-headers: 4.0::<unknown repository> (virtual/os-headers)
sys-libs/glibc:           2.20-r2::<unknown repository>
Repositories:

gentoo
    location: /usr/portage
    sync-type: rsync
    sync-uri: rsync://rsync27.us.gentoo.org/gentoo-portage
    priority: -1000

gnome
    location: /var/lib/layman/gnome
    masters: gentoo
    priority: 50

miramir
    location: /var/lib/layman/miramir
    masters: gentoo
    priority: 50

sublime-text
    location: /var/lib/layman/sublime-text
    masters: gentoo
    priority: 50

vmware
    location: /var/lib/layman/vmware
    masters: gentoo
    priority: 50

ACCEPT_KEYWORDS="amd64 ~amd64"
ACCEPT_LICENSE="* -@EULA"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/lib64/libreoffice/program/sofficerc /usr/share/gnupg/qualified.txt /var/lib/hsqldb"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php5.3/ext-active/ /etc/php/apache2-php5.4/ext-active/ /etc/php/apache2-php5.5/ext-active/ /etc/php/apache2-php5.6/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/cgi-php5.4/ext-active/ /etc/php/cgi-php5.5/ext-active/ /etc/php/cgi-php5.6/ext-active/ /etc/php/cli-php5.3/ext-active/ /etc/php/cli-php5.4/ext-active/ /etc/php/cli-php5.5/ext-active/ /etc/php/cli-php5.6/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/texmf/web2c"
CXXFLAGS="-O2 -pipe"
DISTDIR="/usr/portage/distfiles"
FCFLAGS="-O2 -pipe"
FEATURES="assume-digests binpkg-logs config-protect-if-modified distlocks ebuild-locks fixlafiles merge-sync news parallel-fetch preserve-libs protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync"
FFLAGS="-O2 -pipe"
GENTOO_MIRRORS="http://distfiles.gentoo.org"
LANG="en_US.utf8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
PKGDIR="/usr/portage/packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
PORTAGE_TMPDIR="/var/tmp"
USE="ABI_X86_32 X a52 aac acl acpi alsa amd64 berkdb bluetooth branding bzip2 cairo cdda cdr cli colord cracklib crypt cups cxx dbus dri dts dvd dvdr eds emboss encode evo exif fam firefox flac fortran gdbm gif glamor gnome gnome-keyring gnome-online-accounts gpm gstreamer gtk gtk3 gtreamer iconv introspection ipv6 jpeg lcms ldap libnotify libsecret mad mmx mmxext mng modules mp3 mp4 mpeg multilib nautilus ncurses nls nptl nvidia ogg opengl openmp pam pango pcre pdf png policykit ppds pulseaudio qt3support qt4 readline sdl session sound spell sse sse2 ssl startup-notification svg systemd tcpd tiff tracker truetype udev udisks unicode upower usb vorbis wxwidgets x264 xcb xml xv xvid xvmc zlib" ABI_X86="64 32" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="kexi words flow plan sheets stage tables krita karbon braindump author" CAMERAS="ptp2" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="aes mmx mmxext popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ublox ubx" INPUT_DEVICES="keyboard mouse evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php5-5" PYTHON_SINGLE_TARGET="python3_3" PYTHON_TARGETS="python2_7 python3_4 python3_3" RUBY_TARGETS="ruby19 ruby21 ruby22 ruby20" USERLAND="GNU" VIDEO_CARDS="fbdev glint intel mach64 mga nouveau nv r128 radeon savage sis tdfx trident vesa via vmware dummy v4l" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LC_ALL, MAKEOPTS, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, USE_PYTHON
Comment 3 Gilles Dartiguelongue (RETIRED) gentoo-dev 2015-05-11 07:33:42 UTC
*** Bug 549132 has been marked as a duplicate of this bug. ***
Comment 4 Harris Landgarten 2015-05-18 20:54:31 UTC
I think this bug is fixed. Totem-3.16 works and I tested girl and it works as well.
Comment 5 Pacho Ramos gentoo-dev 2015-05-19 19:00:13 UTC
Without needing the workaround needed for nvidia drivers? (looks like upstream report is still opened and I see no fix for this :/)
Comment 6 Harris Landgarten 2015-05-19 20:20:50 UTC
I am using nvidia-drivers
Comment 7 Pacho Ramos gentoo-dev 2015-05-28 09:23:00 UTC
Lets see if people still suffer this with full 3.16 setup
Comment 8 Harris Landgarten 2015-05-29 03:57:04 UTC
It works for me but I have CLUTTER_BACKEND=x11 in /etc/env.d/00totem.

As far as I know there has not yet been a fix for nvidia-drivers use with programs that use clutter.

see:

https://bugzilla.gnome.org/show_bug.cgi?id=747489
Comment 9 Pacho Ramos gentoo-dev 2015-05-30 09:02:02 UTC
(In reply to Harris Landgarten from comment #8)
> It works for me but I have CLUTTER_BACKEND=x11 in /etc/env.d/00totem.
> 
> As far as I know there has not yet been a fix for nvidia-drivers use with
> programs that use clutter.
> 
> see:
> 
> https://bugzilla.gnome.org/show_bug.cgi?id=747489

We need to install that env.d file then until it's finally fixed, right? :/ (I don't have a nvidia-drivers setup to test :S)
Comment 10 Harris Landgarten 2015-05-30 12:26:58 UTC
that is the only workaround I have found. I also had to do the same for cheese and pitivi as they are effected by the same bug.
Comment 11 Pacho Ramos gentoo-dev 2015-05-30 12:50:11 UTC
Maybe we will need to make media-libs/clutter[X,video_cards_nvidia] to install that env.d file forcing the usage of x11 clutter backend

As a side note, other downstream reports (to see how they fix this for now)
https://bugs.archlinux.org/task/44531
https://bugzilla.opensuse.org/show_bug.cgi?id=931446
Comment 12 Harris Landgarten 2015-05-30 17:24:54 UTC
somehow programs that use clutter need to be wrapped with CLUTTER_BACKEND=x11. I assume this is a temporary situation so we should not go too crazy. 

from my testing creating /etc/env.d files is a partial solution. Everything works from the command line. Girl can call totem. But direct launching of totem or cheese from gnome-shell gives an error:

(cheese:17078): Gdk-ERROR **: The program 'cheese' received an X Window System error.
May 30 13:21:27 harrisl-desktop org.gnome.Cheese[1246]: This probably reflects a bug in the program.
May 30 13:21:27 harrisl-desktop org.gnome.Cheese[1246]: The error was 'BadMatch (invalid parameter attributes)'.
May 30 13:21:27 harrisl-desktop org.gnome.Cheese[1246]: (Details: serial 462 error_code 8 request_code 153 (GLX) minor_code 31)
May 30 13:21:27 harrisl-desktop org.gnome.Cheese[1246]: (Note to programmers: normally, X errors are reported asynchronously;
May 30 13:21:27 harrisl-desktop org.gnome.Cheese[1246]: that is, you will receive the error a while after causing it.
May 30 13:21:27 harrisl-desktop org.gnome.Cheese[1246]: To debug your program, run it with the GDK_SYNCHRONIZE environment
May 30 13:21:27 harrisl-desktop org.gnome.Cheese[1246]: variable to change this behavior. You can then get a meaningful
May 30 13:21:27 harrisl-desktop org.gnome.Cheese[1246]: backtrace from your debugger if you break on the gdk_x_error() function.)


Is it possible to just build clutter to use the x11 backend as default and what if any issues does that entail.

It would be obviously better to deal with this issue in the clutter ebuild but creating an unknown number of /etc/env.d files or stub files would be problematic because it would not work if new clutter backed programs were later installed fresh
Comment 13 Pacho Ramos gentoo-dev 2015-05-30 17:32:10 UTC
If I don't misremember we can simply drop a file in /etc/env.d to get the desired variable exported globally and, then, every app respecting that variable should use x11 (as it works for all the other stuff under /etc/env.d... or am I missing anything? :/)
Comment 14 Pacho Ramos gentoo-dev 2015-05-30 17:34:32 UTC
Well... the other option is to try to build clutter with --enable-gdk-backend=no --enable-x11-backend=yes
Comment 15 Pacho Ramos gentoo-dev 2015-05-30 17:40:10 UTC
This is the commit I thing made this problem to be more visible:
https://git.gnome.org/browse/clutter/commit/?id=60dbeb9425f51fc602ba2fe89b2a968ef4b527ed

and that maybe could be reverted 

(introduced with 1.21.4 clutter version)
Comment 16 Harris Landgarten 2015-05-30 18:32:08 UTC
I can test whatever you like this weekend.
Comment 17 Pacho Ramos gentoo-dev 2015-05-30 18:56:23 UTC
(In reply to Harris Landgarten from comment #16)
> I can test whatever you like this weekend.

Does the env.d hack work when running affected app from gnome-shell for example? Or does it only work when manually running them from a terminal?
Comment 18 Harris Landgarten 2015-05-30 19:02:11 UTC
currently totem and cheese work from command line but do not work when launched from gnome-shell. totem works with girl when called in background to play a radio stream. piviti works in both gnome-shell and command line.

Those are the only apps I have that are effected.
Comment 19 Pacho Ramos gentoo-dev 2015-05-30 19:23:51 UTC
I would then opt for reverting:
https://git.gnome.org/browse/clutter/commit/?id=60dbeb9425f51fc602ba2fe89b2a968ef4b527ed

For that, you can get the patch from:
https://git.gnome.org/browse/clutter/patch/?id=60dbeb9425f51fc602ba2fe89b2a968ef4b527ed

And do "epatch -R" with it.

I prefer that over disabling gdk in clutter building because maybe some tool will need it (even if not preferred) exactly as, for example, mutter uses x11 backend without taking care of gdk being now preferred
Comment 20 Harris Landgarten 2015-05-30 20:09:42 UTC
that patch fixes the issue.
Comment 21 Pacho Ramos gentoo-dev 2015-05-30 20:38:09 UTC
Nice, thanks for testing! 

Also, do you have any other setup (for example with nouveau, fglrx or radeon) to confirm this issue is only afecting nvidia-drivers and not any non-intel setup? :/
Comment 22 Harris Landgarten 2015-05-30 21:16:09 UTC
I believe it is only nvidia. I have been trying to get nouveau working all day with my 4 monitor setup but keep getting blank screens. Looks like gdm cannot find gdm-shell.session which doesn't seem to around anymore and then gdm-session fails. Might be one of the problems with the gdm bug you show as resolved but definitely isn't yet.
Comment 23 Harris Landgarten 2015-05-30 22:50:28 UTC
gdm-3.16 bug is fixed.

Put this where you like.

Issue was old files in /etc/dconf

/etc/dconf/db/gdm.d/00-upstream-settings referenced gdm-shell which has been removed as a session

rm -rf /etc/dconf

sudo cave resolve dconf ibus 

and the issue is fixed.

gdm ebuild should remove /etc/dconf/gdm and /etc/dconf/gdm.d if they are there
Comment 24 Pacho Ramos gentoo-dev 2015-05-31 09:54:30 UTC
*** Bug 550868 has been marked as a duplicate of this bug. ***
Comment 25 Harris Landgarten 2015-06-09 16:19:44 UTC
After following the upstream bug I have a suggestion on how to handle clutter. If I understand the illogic of upstream they refuse to revert the patch because wayland needs it.

It is clearly a bug that no one is assigned to fix so I vote for reverting the patch and putting a wayland use flag in clutter that would not revert the patch. I think this is better than an nvidia flag since the issue isn't nvidia.
Comment 26 Pacho Ramos gentoo-dev 2015-06-10 09:35:06 UTC
I prefer to only apply it for nvidia as, even if it's not their culprit, it will still allow most people to run the "official" way that is the one that upstream will use. 

But yeah... I agree with you that upstream is acting in a really stupid way keeping this broken on purpose and refusing to revert the change (as they did in previous cycle) :S
Comment 27 Pacho Ramos gentoo-dev 2015-06-10 09:39:14 UTC
Keeping the gdk backend as default for the rest of devices will also keep the benefit of workarounding the original bug that "reminded" upstream to move the defaults:
https://bugzilla.gnome.org/show_bug.cgi?id=734587

And yeah, it's interesting the order was switched for workarounding a bug and now they keep it broken for forcing people to really FIX the other issue :(
Comment 28 Gilles Dartiguelongue (RETIRED) gentoo-dev 2015-06-10 10:53:24 UTC
Considering the nature of the problem, I think I would rather have the env.d file either controlled by USE=video_cards_nvidia or installed unconditionally. Less (optional) patching to do which is imho always better.
Comment 29 poncho 2015-06-10 11:18:47 UTC
To make the affected applications work from gnome-shell launcher, the variable needs to be exported by gnome-session (tested with cheese).

This way, applications that aren't launched manually (tested with sushi) are fixed as well.

diff --git a/gnome-session/main.c b/gnome-session/main.c
index e68b6f4..a3e0e57 100644
--- a/gnome-session/main.c
+++ b/gnome-session/main.c
@@ -349,6 +349,8 @@ main (int argc, char **argv)
          */
         gsm_util_setenv ("XDG_MENU_PREFIX", "gnome-");
 
+        gsm_util_setenv ("CLUTTER_BACKEND", "x11");
+
         gsm_util_set_autostart_dirs (override_autostart_dirs);
         session_name = opt_session_name;
Comment 30 Pacho Ramos gentoo-dev 2015-06-10 15:56:32 UTC
I prefer the optional patching in cogl (that we know is broken and needs that "special" patching for this) than needing to patch also our gnome-session in an "unofficial" way to get that variable exported :|
Comment 31 Pacho Ramos gentoo-dev 2015-06-10 16:03:36 UTC
Another problem with /etc files files is that I am unsure what will occur if, in the future, people edit or rename it locally and we end up having people with that env being still (silently) exported because of forgotten files there that weren't removed when needed, that is one reason I regenerally don't want to rely on files under /etc for settings that we want to be set "by default".

Also, that env.d file could be used for people playing with that variable randomly and switching to different backends... and that is something we certainly don't want to "promote" in any way, we want to set it to x11 for nvidia (because it's needed to get things working there) and let the upstream default for "gdk" on the rest as it workarounds other bugs. But we don't want other values
Comment 32 Pacho Ramos gentoo-dev 2015-06-10 16:06:46 UTC
I have seen that new patches have been proposed in upstream bug report to fix this in "the right way"... testing is highly appreciated (I don't have anyt nvidia setup for a long time to test this myself :(

https://bugzilla.gnome.org/show_bug.cgi?id=747489
Comment 33 Alexandre Rostovtsev (RETIRED) gentoo-dev 2015-06-10 16:11:38 UTC
(In reply to Pacho Ramos from comment #32)

The patches are for git master, they need some minor rebasing for 3.16.
Comment 34 Harris Landgarten 2015-06-10 16:42:17 UTC
If someone can get the patches ready to apply I would be happy to test them.
Comment 36 Harris Landgarten 2015-06-10 22:35:30 UTC
I applied all the patches except the so name change and forced the config patch for clutter-gtk to accept clutter-1.22.2 (it wants clutter-1.22.3)

I tested totem cheese and pitivi. They both work as expected and both failed with 1.22.2 clutter unpatched.

There is some cleanup needed and clutter version needs to be bumped but it looks like the bug is fixed
Comment 37 Alexandre Rostovtsev (RETIRED) gentoo-dev 2015-06-11 00:35:57 UTC
Should be fixed now, thanks a lot for investigating and testing this!

+*clutter-1.22.2-r1 (11 Jun 2015)
+
+  11 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +clutter-1.22.2-r1.ebuild,
+  +files/clutter-1.22.2-clutter_gdk_get_visual.patch,
+  +files/clutter-1.22.2-clutter_gdk_get_visual-2.patch,
+  +files/clutter-1.22.2-cogl-visual-xlib.patch,
+  +files/clutter-1.22.2-touchpad-detection.patch:
+  Add upstream patch to fix touchpad detection. Add upstream patches to fix
+  totem crashes with nvidia-drivers (bug #549036, thanks to Harris Landgarten
+  and Pacho Ramos).

+*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).