Replaced MPlayer and GNOME-MPlayer with GStreamer-based Totem

This allows for a more unified set of video playback libraries,
including those used by HTML5 video/audio and Netscape plugins
in Midori.

conf/rootfs.excludes

@@ -230,6 +230,8 @@
 /usr/bin/pcf2vpnc
 # media-libs/gst-plugins-base: input audio visualization
 /usr/bin/gst-visualise*
+# media-video/totem: bug reporting
+/usr/libexec/totem/totem-bugreport.py
 
 # OpenSSH server
 /etc/ssh/sshd_config
@@ -245,6 +247,7 @@
 /usr/bin/gs
 /usr/bin/vpxdec
 /usr/bin/vpxenc
+/usr/bin/luac
 /usr/bin/orcc
 /usr/bin/orc-bugreport
 /usr/sbin/vboxguest-service

doc/changelog.txt

@@ -26,10 +26,11 @@
   * Added cables communication identity information applet
 
   * Added small and fast Java runtime environment (JamVM)
-  * Added HTML5 video/audio support to Midori
+  * Added HTML5 and plugin-based video/audio support to Midori
   * Added SASL (plain) authentication and OTR encryption support to XChat
   * Added PPTP/OpenVPN/Cisco VPN support to NetworkManager
   * Added emelFM2 2-pane file manager
+  * Replaced MPlayer with Totem (GStreamer-based)
   * Replaced xvkbd with Florence virtual keyboard
 
   * Audio mixer channels are heuristically set up on boot

doc/info.txt

@@ -47,10 +47,9 @@ openvpn                 ssl                     ssl             networkmanager-o
 pkcs11-helper           !ssl, gnutls, nss       ssl             openvpn
 
 glib-networking         gnutls                  gnutls          libsoup(midori, gst-plugins-soup)
-libsoup                 gnutls                  gnutls          midori, gst-plugins-soup
-curl                    ssl, gnutls, nss        gnutls          gnupg, fbreader
+libsoup                 gnutls                  gnutls          midori, gst-plugins-soup, totem-pl-parser
+curl                    ssl, gnutls, nss        gnutls          gnupg, fbreader, quvi
 neon                    ssl, gnutls             gnutls          audacious-plugins
-rtmpdump                ssl, gnutls, polarssl   gnutls          mplayer
 wget                    ssl                     ssl             portage, libqalculate(forex)
 
 cyrus-sasl              ssl                     ssl             pidgin

src/etc/make.conf

@@ -28,15 +28,15 @@ MAKEOPTS="-j3"
 
 # USE flags (aggregative)
 
-USE="aac acpi alsa aspell bidi bluetooth bs2b cairo caps cdda cjk consolekit
-     cue dbus dhcp djvu dynamic eap-tls exif expat fbcondecor flac
-     fontconfig gmp grammar gconf glib groupwise gtk hires-icons hybrid-auth
-     id3tag idn iproute2 irda jbig jpeg jpeg2k lcms libnotify lzma mad
-     madwifi mktemp mmx mp3 multicall networkmanager ogg opengl ots pcmcia
-     pcsc-lite pkcs11 png policykit pth scsi silc smartcard smime sndfile
-     speex spell sse startup-notification staticsocket svg symlink thesaurus
-     thin-splines threads tiff tordns truetype unicode usb v4l2 vorbis
-     wavpack wimax wmf X X509 x86emu xattr xinerama xmp xv xvmc"
+USE="aac acpi alsa archive aspell bidi bluetooth bs2b cairo caps cdda cjk
+     consolekit cue dbus dhcp djvu dynamic eap-tls exif expat fbcondecor
+     flac fontconfig gmp grammar gconf glib groupwise gtk hires-icons
+     hybrid-auth id3tag idn iproute2 irda jbig jpeg jpeg2k lcms libnotify
+     lzma mad madwifi mktemp mmx mp3 multicall networkmanager ogg opengl ots
+     pcmcia pcsc-lite pkcs11 png policykit pth scsi silc smartcard smime
+     sndfile speex spell sse startup-notification staticsocket svg symlink
+     thesaurus thin-splines threads tiff tordns truetype unicode usb v4l2
+     vorbis wavpack wimax wmf X X509 x86emu xattr xinerama xmp xv xvmc"
 
 USE="${USE} -ant -berkdb -cddb -cracklib -cramfs -cups -cxx -dirac -encode
      -fts3 -gdbm -git -gtk3 -http-cache -hunspell -live -lvm1 -mng -mudflap

src/etc/portage/package.mask/common

@@ -3,4 +3,3 @@
 
 # GTK 3
 >=x11-libs/gtk+-3
->=media-video/gnome-mplayer-1.0.4

src/etc/portage/package.use

@@ -9,10 +9,10 @@ net-dialup/ppp                  -gtk
 gnome-extra/libgsf              -gtk
 dev-lang/python                 -ncurses -readline
 net-im/pidgin                   -ncurses
+dev-lang/lua                    -readline
 dev-libs/libxml2                -readline
 sci-visualization/gnuplot       -readline
 dev-db/sqlite                   -readline
-media-video/mplayer             -opengl
 media-libs/jasper               -opengl
 
 # Drivers
@@ -21,7 +21,6 @@ media-libs/jasper               -opengl
 # [also modified: rootfs.excludes#r[36]00_dri.*, setup#eselect mesa]
 x11-base/xorg-drivers           -video_cards_fbdev
 media-libs/mesa                 -video_cards_vmware shared-dricore -gallium -egl -llvm
-media-video/mplayer             -video_cards_*
 sys-fs/udev                     extras
 sys-fs/ntfsprogs                minimal -crypt
 
@@ -33,7 +32,6 @@ net-libs/libsoup                ssl
 net-libs/glib-networking        ssl
 net-misc/curl                   ssl   gnutls -nss
 net-libs/neon                   ssl   gnutls
-media-video/rtmpdump            ssl   gnutls
 net-wireless/wpa_supplicant     -ssl  gnutls
 net-misc/networkmanager               gnutls -nss
 net-misc/openvpn                ssl
@@ -44,14 +42,11 @@ dev-libs/cyrus-sasl             ssl          -crypt
 net-analyzer/netcat                          -crypt
 
 # Multimedia
-# mplayer: faac, x264, xvid, twolame/toolame and (partly) mp3 are activated only for +encode
-media-video/mplayer             cpudetection custom-cpuopts 3dnow 3dnowext mmxext sse2
-media-video/mplayer             mpg123 -mp3 libmpeg2 rtmp -rar
-media-video/mplayer             -x264 -faac -xvid -twolame -toolame
+media-video/totem               -youtube nsplugin
 media-sound/sox                 encode
 media-plugins/audacious-plugins lame libsamplerate mms
 media-video/gpac                -* aac mad vorbis
-media-plugins/gst-plugins-meta  dv lame theora vpx -flac -wavpack
+media-plugins/gst-plugins-meta  dv lame theora vpx  a52 dts dvd mms mpeg  ffmpeg
 media-libs/libtheora            encode
 net-im/pidgin                   -gstreamer
 dev-java/gnu-classpath          gstreamer

src/home/anon/.mplayer

@@ -1 +0,0 @@
-config/mplayer

src/home/anon/bin/mkclip

@@ -1,117 +0,0 @@
-#!/bin/sh -e
-
-if [ $# = 0 ]  ||  ! echo "$1" | grep -q '\.mp4$'; then
-    echo "Format: $0 <outfile.mp4> [fps]"
-    exit 1
-fi
-
-
-# Variables
-result="$1"
-fps=${2:-7.5}
-audelay=1
-
-tmpdir=$(mktemp -d --tmpdir=$(dirname "${out}") mkclip.XXXXXX)
-fifodir=$(mktemp -d)
-
-
-# Set some traps
-trap 'if [ $? != 0 ]; then kill ${vstrpid} ${astrpid} ${vencpid} ${aencpid} 2>/dev/null || true; rm -rf ${fifodir}; fi' 0
-trap : INT QUIT TERM SEGV
-
-
-# Create FIFOs (need fs support, space not required)
-mkfifo ${fifodir}/video.y4m ${fifodir}/audio.pcm ${fifodir}/mplayer_ctl
-
-
-# Launch encoders, note PIDs for waiting
-x264 --quiet --no-progress --preset fast \
-     -o "${tmpdir}"/video.264 ${fifodir}/video.y4m & vencpid=$!
-
-lame -S --strictly-enforce-ISO --preset phon+ \
-    -r -s 16 --bitwidth 16 -m m 2>/dev/null \
-    ${fifodir}/audio.pcm "${tmpdir}"/audio.mp3 & aencpid=$!
-
-
-# Launch streams, note PIDs for killing
-# (mplayer sometimes dies with -really-quiet)
-mplayer -really-quiet -noconfig all -fps "${fps}" -slave \
-        -input nodefault-bindings:conf=/dev/null:file=${fifodir}/mplayer_ctl \
-        -vf harddup -tv fps="${fps}" tv://               \
-        -vo yuv4mpeg:file=${fifodir}/video.y4m & vstrpid=$!
-echo pausing get_property pause > ${fifodir}/mplayer_ctl
-
-arecord -D mono -qN -t raw -f S16_LE -r 16000 -c 1 - \
-        > ${fifodir}/audio.pcm & astrpid=$!
-kill -STOP ${astrpid}
-
-
-# Signal streamers to start on user input
-echo "Press [Enter] to start..."
-read dummy
-
-kill -CONT ${astrpid}
-sleep ${audelay}
-echo pause > ${fifodir}/mplayer_ctl
-
-
-# Kill streams on user input, then wait for encoders
-echo "Encoding, press [Enter] when done..."
-read dummy
-
-if ! kill -0 ${vstrpid} 2>/dev/null; then
-    vstrpid=err
-else
-    echo stop > ${fifodir}/mplayer_ctl
-fi
-
-if ! kill -INT ${astrpid} 2>/dev/null; then
-    astrpid=err
-fi
-
-if [ ${vstrpid} = err ]; then
-    echo "Video stream source died, killing video encoder"
-    kill ${vencpid} 2>/dev/null || true
-fi
-
-if [ ${astrpid} = err ]; then
-    echo "Audio stream source died, killing audio encoder"
-    kill ${aencpid} 2>/dev/null || true
-fi
-
-wait ${vencpid} || true
-wait ${aencpid} || true
-
-
-# Remove FIFOs
-rm    ${fifodir}/video.y4m ${fifodir}/audio.pcm ${fifodir}/mplayer_ctl
-rmdir ${fifodir}
-
-
-# If there was a streaming error, delete any 0-size files
-if [ ${vstrpid} = err  -o  ${astrpid} = err ]; then
-    if [ ! -s "${tmpdir}"/video.264 ]; then
-        rm -f "${tmpdir}"/video.264
-    fi
-
-    if [ ! -s "${tmpdir}"/audio.mp3 ]; then
-        rm -f "${tmpdir}"/audio.mp3
-    fi
-
-    rmdir --ignore-fail-on-non-empty "${tmpdir}"
-    exit 1
-fi
-
-
-# Copy encoded streams to MP4 container
-lang=$(echo ${LANG} | sed 's/[_.].*//')
-
-MP4Box -quiet -tmp "${tmpdir}"               \
-    -new "${result}" -no-iod                 \
-    -add "${tmpdir}"/video.264:fps="${fps}" \
-    -add "${tmpdir}"/audio.mp3:lang="${lang:-und}"
-
-
-# Remove encoded streams
-rm    "${tmpdir}"/video.264 "${tmpdir}"/audio.mp3
-rmdir "${tmpdir}"

src/home/anon/config/gtk-2.0/gconf/apps/gnome-mplayer/preferences/%gconf.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<gconf>
-	<entry name="disable-embedded-scaling" mtime="1316486048" type="bool" value="false"/>
-	<entry name="disable-embedding" mtime="1316486048" type="bool" value="false"/>
-	<entry name="disable-midi" mtime="1316486048" type="bool" value="true"/>
-	<entry name="disable-dvx" mtime="1316486048" type="bool" value="false"/>
-	<entry name="disable-wmp" mtime="1316486048" type="bool" value="false"/>
-	<entry name="disable-real" mtime="1316486048" type="bool" value="false"/>
-	<entry name="disable-qt" mtime="1316486048" type="bool" value="false"/>
-	<entry name="extraopts" mtime="1316486048" type="string">
-		<stringvalue></stringvalue>
-	</entry>
-	<entry name="mplayer-dvd-device" mtime="1316486048" type="string">
-		<stringvalue></stringvalue>
-	</entry>
-	<entry name="show-subtitles" mtime="1316486048" type="bool" value="true"/>
-	<entry name="subtitle-margin" mtime="1316486048" type="int" value="0"/>
-	<entry name="subtitle-shadow" mtime="1316486048" type="bool" value="false"/>
-	<entry name="subtitle-outline" mtime="1316486048" type="bool" value="false"/>
-	<entry name="subtitle-color" mtime="1316486048" type="string">
-		<stringvalue>ffffff00</stringvalue>
-	</entry>
-	<entry name="subtitle-codepage" mtime="1316486048" type="string">
-		<stringvalue></stringvalue>
-	</entry>
-	<entry name="subtitle-scale" mtime="1316486048" type="float" value="1"/>
-	<entry name="subtitle-font" mtime="1316486048" type="string">
-		<stringvalue></stringvalue>
-	</entry>
-	<entry name="metadata-codepage" mtime="1316486048" type="string">
-		<stringvalue></stringvalue>
-	</entry>
-	<entry name="verbose" mtime="1316486048" type="int" value="0"/>
-	<entry name="resize-on-new-media" mtime="1316486048" type="bool" value="true"/>
-	<entry name="keep-on-top" mtime="1316486048" type="bool" value="false"/>
-	<entry name="remember-loc" mtime="1316486048" type="bool" value="false"/>
-	<entry name="bring-to-front" mtime="1316486048" type="bool" value="false"/>
-	<entry name="replace-and-play" mtime="1316486048" type="bool" value="false"/>
-	<entry name="single-instance" mtime="1316486048" type="bool" value="false"/>
-	<entry name="vertical" mtime="1316486048" type="bool" value="false"/>
-	<entry name="show-status-icon" mtime="1316486048" type="bool" value="true"/>
-	<entry name="show-notification" mtime="1316486048" type="bool" value="true"/>
-	<entry name="mouse-wheel-changes-volume" mtime="1316486048" type="bool" value="false"/>
-	<entry name="use-xscrnsaver" mtime="1316486048" type="bool" value="false"/>
-	<entry name="use-defaultpl" mtime="1316486048" type="bool" value="false"/>
-	<entry name="use-mediakeys" mtime="1316486048" type="bool" value="true"/>
-	<entry name="show-details" mtime="1316486048" type="bool" value="false"/>
-	<entry name="show-playlist" mtime="1316486048" type="bool" value="false"/>
-	<entry name="disable-animation" mtime="1316486048" type="bool" value="false"/>
-	<entry name="disable-pause-on-click" mtime="1316486048" type="bool" value="true"/>
-	<entry name="disable-framedrop" mtime="1316486048" type="bool" value="false"/>
-	<entry name="disable-deinterlace" mtime="1316486048" type="bool" value="true"/>
-	<entry name="disable-embeddedfonts" mtime="1316486048" type="bool" value="false"/>
-	<entry name="disable-ass" mtime="1316486048" type="bool" value="false"/>
-	<entry name="force-cache" mtime="1316486048" type="bool" value="false"/>
-	<entry name="volume-gain" mtime="1316486048" type="int" value="0"/>
-	<entry name="remember-softvol" mtime="1316486048" type="bool" value="false"/>
-	<entry name="softvol" mtime="1316486048" type="bool" value="false"/>
-	<entry name="pp-level" mtime="1316486048" type="int" value="0"/>
-	<entry name="osd-level" mtime="1316486048" type="int" value="0"/>
-	<entry name="alsa-mixer" mtime="1316486048" type="string">
-		<stringvalue></stringvalue>
-	</entry>
-	<entry name="plugin-video-cache-size" mtime="1316486048" type="int" value="2048"/>
-	<entry name="plugin-audio-cache-size" mtime="1316486048" type="int" value="128"/>
-	<entry name="cache-size" mtime="1316486048" type="int" value="2000"/>
-	<entry name="use-hw-audio" mtime="1316486048" type="bool" value="false"/>
-	<entry name="audio-channels" mtime="1316486048" type="int" value="2"/>
-	<entry name="audio-device-name" mtime="1316486048" type="string">
-		<stringvalue>Default</stringvalue>
-	</entry>
-	<entry name="last-dir" mtime="1316485841" type="string">
-		<stringvalue>file:///home/anon</stringvalue>
-	</entry>
-</gconf>

src/home/anon/config/gtk-2.0/gconf/apps/totem/%gconf.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<gconf>
+	<entry name="autoload_subtitles" mtime="1319813975" type="bool" value="true"/>
+	<entry name="open_path" mtime="1319813735" type="string">
+		<stringvalue>file:///home/anon</stringvalue>
+	</entry>
+	<entry name="subtitle_encoding" mtime="1319813724" type="string">
+		<stringvalue>UTF-8</stringvalue>
+	</entry>
+	<entry name="visual_quality" mtime="1319813724" type="int" value="0"/>
+	<entry name="visual" mtime="1319752621" type="string">
+		<stringvalue>GOOM: what a GOOM!</stringvalue>
+	</entry>
+	<entry name="show_vfx" mtime="1319813724" type="bool" value="true"/>
+	<entry name="audio_output_type" mtime="1319752621" type="int" value="0"/>
+	<entry name="debug" mtime="1319813724" type="bool" value="false"/>
+</gconf>

src/home/anon/config/gtk-2.0/gconf/apps/totem/plugins/chapters/%gconf.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<gconf>
+	<entry name="active" mtime="1319813724" type="bool" value="true"/>
+</gconf>

src/home/anon/config/gtk-2.0/gconf/apps/totem/plugins/media_player_keys/%gconf.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<gconf>
+	<entry name="active" mtime="1319813724" type="bool" value="true"/>
+</gconf>

src/home/anon/config/gtk-2.0/gconf/apps/totem/plugins/movie-properties/%gconf.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<gconf>
+	<entry name="active" mtime="1319813724" type="bool" value="true"/>
+</gconf>

src/home/anon/config/gtk-2.0/gconf/apps/totem/plugins/ontop/%gconf.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<gconf>
+	<entry name="active" mtime="1319813946" type="bool" value="true"/>
+</gconf>

src/home/anon/config/gtk-2.0/gconf/apps/totem/plugins/screensaver/%gconf.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<gconf>
+	<entry name="active" mtime="1319813724" type="bool" value="true"/>
+</gconf>

src/home/anon/config/gtk-2.0/gconf/apps/totem/plugins/screenshot/%gconf.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<gconf>
+	<entry name="active" mtime="1319813724" type="bool" value="true"/>
+</gconf>

src/home/anon/config/gtk-2.0/gconf/apps/totem/plugins/skipto/%gconf.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<gconf>
+	<entry name="active" mtime="1319813724" type="bool" value="true"/>
+</gconf>

src/home/anon/config/mplayer/config

@@ -1,16 +0,0 @@
-
-[default]
-quiet=yes
-ass-use-margins=yes
-stop-xscreensaver=yes
-
-font="Sans"
-
-af-add=bs2b
-vf-add=screenshot
-zoom=yes
-
-tv=driver=v4l2
-
-[gnome-mplayer]
-msglevel=all=5

src/home/anon/config/totem/state.ini

@@ -0,0 +1,8 @@
+
+[State]
+window_w=362
+window_h=493
+show_sidebar=false
+maximised=false
+sidebar_w=0
+sidebar_page=properties

src/root/setup

@@ -286,8 +286,10 @@ awk '/UTF-8/ && !/^iw_IL/ { match($1, /^([a-z]+)_([A-Z]+)\y(.*@([^.]*))?/, a); p
 awk -F '\t' '!/^#/ { printf "%s %s \"%s\"\n", $1, $3, $4 }' /usr/share/zoneinfo/zone.tab | sed "${ccrep}" | LC_ALL=C sort | tr '\n' ' ' > /etc/timezone.menu
 
 
+# midori, totem, gst-plugin-scanner: ffmpeg, ffmpegscale, postproc GStreamer plugins
 sinfo "Selectively disabling PAX"
-paxctl -m /usr/bin/mplayer /usr/bin/mpg123 /usr/bin/jamvm
+paxctl -m /usr/bin/midori /usr/bin/totem* /usr/libexec/gstreamer*/gst-plugin-scanner \
+          /usr/bin/mpg123 /usr/bin/jamvm
 
 
 sinfo "Configuring fontconfig"

src/root/setup-copy

@@ -39,7 +39,7 @@ sed -i /TEMP/d /var/lib/portage/world /etc/portage/package.use
 # NOTE: the below patches are intended for depclean
 #
 # python:  portage, xcb-proto, libglade, gtk+, gucharmap, glib, exiv2, pidgin, mesa,
-#          gobject-introspection, openbox
+#          gobject-introspection, openbox, totem
 # perl:    gentoolkit, lm_sensors, graphicsmagick, eboard, xdg-utils, pptpclient
 # cpio:    splashutils
 # debianutils:     ca-certificates
@@ -61,6 +61,7 @@ ebuilds="app-misc/ca-certificates
          media-gfx/splashutils
          media-libs/mesa
          media-plugins/gst-plugins-vp8
+         media-video/totem
          net-dialup/pptpclient
          net-im/pidgin
          sys-apps/lm_sensors
@@ -80,7 +81,7 @@ done
 # (allows depclean after python unmerge + shadow copy)
 sed -i 's/\${python_dep}//' ${ebuild_portage}
 
-# Perl is not needed at all (x2)
+# Perl is not needed at all by gentoolkit and eboard
 # Perl is only needed by sensors-detect and sensors-conf-convert
 # Perl is not needed for pptpclient when used by networkmanager-pptp
 sed -i s:dev-lang/perl:: ${ebuild_gentoolkit} ${ebuild_eboard} ${ebuild_lm_sensors} \
@@ -88,11 +89,12 @@ sed -i s:dev-lang/perl:: ${ebuild_gentoolkit} ${ebuild_eboard} ${ebuild_lm_senso
 
 # Python is only (possibly) needed during libxcb build
 # Python is only needed by libglade-convert
-# Python is not needed at all by gtk+, gucharmap, glib and exiv2
+# Python is not needed at all by gtk+, gucharmap, glib, exiv2 and totem
 # Python is only needed by g-ir-{scanner,annotation-tool}
 sed -i 's:^\(inherit\>.*\) python\>:\1:' ${ebuild_xcbproto} ${ebuild_libglade} \
                                          ${ebuild_gtk} ${ebuild_gucharmap} ${ebuild_glib} \
-                                         ${ebuild_exiv2} ${ebuild_gobjectintrospection}
+                                         ${ebuild_exiv2} ${ebuild_gobjectintrospection} \
+                                         ${ebuild_totem}
 
 # Python is needed by dbus-python, which is a non-separated dependency in ebuild
 sed -i 's:\<dev-python/dbus-python\>::' ${ebuild_pidgin}
@@ -333,7 +335,7 @@ update-desktop-database -q /usr/share/applications
 sinfo "Modifying MIME actions ordering preferences"
 sed -i 's/\<geeqie.desktop;gpicview.desktop;/gpicview.desktop;geeqie.desktop;/ ;
         s/\<epdfview.desktop;evince.desktop;/evince.desktop;epdfview.desktop;/ ;
-        s/\<gnome-mplayer.desktop;audacious.desktop;/audacious.desktop;gnome-mplayer.desktop;/' \
+        s/\<totem.desktop;audacious.desktop;/audacious.desktop;totem.desktop;/' \
     /usr/share/applications/mimeinfo.cache
 
 

src/var/lib/portage/world

@@ -142,8 +142,7 @@ app-cdr/xcdroast
 # app-cdr/graveman
 app-cdr/isomaster
 media-sound/audacious
-media-video/gnome-mplayer
-media-video/x264-encoder
+media-video/totem
 media-gfx/gpicview
 media-gfx/geeqie
 media-gfx/fbida
@@ -167,13 +166,14 @@ app-text/fbreader
 net-irc/xchat
 
 # Plugins
-media-plugins/gst-plugins-gconf
 media-plugins/gst-plugins-meta
-media-plugins/gst-plugins-x264
-media-plugins/gst-plugins-vp8
+media-plugins/gst-plugins-cdio
+media-plugins/gst-plugins-jpeg
+media-plugins/gst-plugins-libpng
 media-plugins/gst-plugins-speex
-media-plugins/gst-plugins-pango
-media-plugins/gst-plugins-soup
+media-plugins/gst-plugins-x264
+media-plugins/gst-plugins-ximagesrc
+media-plugins/gst-plugins-xvid
 net-irc/xchat-otr
 x11-plugins/pidgin-otr
 x11-plugins/pidgin-libnotify